Merge pull request #14 from jcpowermac/inventory_cleanup

Removed CSC specific inventory items
dxc-technology · Oct 20, 2015 · bc36d54 · bc36d54
2 parents 15aca7e + 829d20b
commit bc36d54
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/ansible.cfg b/ansible.cfg
@@ -1,5 +1,5 @@
 [defaults]
-hostfile = ../wiley/inventory/hosts.ini
+inventory = ./inventory/hosts.ini
 host_key_checking = False
 remote_user = root
 forks = 50

diff --git a/inventory/group_vars/all/common.yml b/inventory/group_vars/all/common.yml
@@ -35,7 +35,7 @@ scaleio_mdm_secondary_ip: "{{ hostvars[groups['mdm'][1]]['ansible_'+scaleio_inte
 scaleio_mdm_secondary_mgmt_ip: "{{ hostvars[groups['mdm'][1]]['ansible_'+scaleio_mgmt_interface]['ipv4']['address'] }}"
 
 # This IP address is either a single system or a VIP for HAproxy e.g. in OpenStack 
-scaleio_gateway_ip: 172.17.17.112 
+scaleio_gateway_ip: 
 
 scaleio_tb_ip: "{{ hostvars[groups['tb'][0]]['ansible_'+scaleio_interface]['ipv4']['address'] }}"
 

diff --git a/inventory/hosts.ini b/inventory/hosts.ini
@@ -1,9 +1,9 @@
 [mdm]
-wiley-scale-1 ansible_ssh_host=172.17.16.77
-wiley-scale-2 ansible_ssh_host=172.17.16.78
+scale-1 
+scale-2 
 
 [tb]
-wiley-scale-3 ansible_ssh_host=172.17.16.79
+scale-3 
 
 [sds:children]
 mdm
@@ -15,14 +15,14 @@ tb
 #controller
 
 [compute]
-wiley-cmp-1 ansible_ssh_host=172.17.16.73
+cmp-1 
 
 [sdc:children]
 sds
 gateway
 compute
 
 [controller]
-wiley-ctlr-1 ansible_ssh_host=172.17.16.70
-wiley-ctlr-2 ansible_ssh_host=172.17.16.71
-wiley-ctlr-3 ansible_ssh_host=172.17.16.72
+ctlr-1
+ctlr-2
+ctlr-3