x/compass-core
Code Issues Proposed changes

modify host ip to mgmt ip

Browse Source 
add some varibles to obtain mgmt ip cidr
modify hosts ip to mgmt ip

Change-Id: I6bd10857ec3abc56b0430b33627af2dc47b6863b
Signed-off-by: grakiss <grakiss.wanglei@huawei.com>
This commit is contained in:
grakiss 2015-12-15 10:05:11 +08:00
parent 59566a58bf
commit 227bc55878
6 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
conf/templates/ansible_installer/openstack_juno/hosts/HA-ansible-multinodes.tmpl
View File

@ -1,3 +1,12 @@
#set ip_settings={}
#for k,v in $getVar('ip_settings', {}).items()
#set host_ip_settings={}
#for intf in v
#set $host_ip_settings[$intf["alias"]]=intf
#end for
#set $ip_settings[$k]=$host_ip_settings
#end for
# localhost # localhost
127.0.0.1 localhost 127.0.0.1 localhost
#set controllers = $getVar('controller', []) #set controllers = $getVar('controller', [])
@ -10,13 +19,13 @@
#end if #end if
# controller # controller
#for worker in $controllers #for worker in $controllers
#set worker_ip = $worker.install.ip
#set worker_hostname = $worker.hostname #set worker_hostname = $worker.hostname
#set worker_ip = $ip_settings[$worker_hostname].mgmt.ip
$worker_ip $worker_hostname $worker_ip $worker_hostname
#end for #end for
# compute # compute
#for worker in $computes #for worker in $computes
#set worker_ip = $worker.install.ip
#set worker_hostname = $worker.hostname #set worker_hostname = $worker.hostname
#set worker_ip = $ip_settings[$worker_hostname].mgmt.ip
$worker_ip $worker_hostname $worker_ip $worker_hostname
#end for #end for

1
conf/templates/ansible_installer/openstack_juno/vars/HA-ansible-multinodes.tmpl
View File

@ -37,6 +37,7 @@ deploy_type: $getVar('deploy_type', 'virtual')
public_cidr: $computers[0]['install']['subnet'] public_cidr: $computers[0]['install']['subnet']
storage_cidr: "{{ ip_settings[inventory_hostname]['storage']['cidr'] }}" storage_cidr: "{{ ip_settings[inventory_hostname]['storage']['cidr'] }}"
mgmt_cidr: "{{ ip_settings[inventory_hostname]['mgmt']['cidr'] }}"
public_net_info: "{{ network_cfg.public_net_info }}" public_net_info: "{{ network_cfg.public_net_info }}"
host_ip_settings: "{{ ip_settings[inventory_hostname] }}" host_ip_settings: "{{ ip_settings[inventory_hostname] }}"

13
conf/templates/ansible_installer/openstack_kilo/hosts/HA-ansible-multinodes.tmpl
View File

@ -1,3 +1,12 @@
#set ip_settings={}
#for k,v in $getVar('ip_settings', {}).items()
#set host_ip_settings={}
#for intf in v
#set $host_ip_settings[$intf["alias"]]=intf
#end for
#set $ip_settings[$k]=$host_ip_settings
#end for
# localhost # localhost
127.0.0.1 localhost 127.0.0.1 localhost
#set controllers = $getVar('controller', []) #set controllers = $getVar('controller', [])
@ -10,13 +19,13 @@
#end if #end if
# controller # controller
#for worker in $controllers #for worker in $controllers
#set worker_ip = $worker.install.ip
#set worker_hostname = $worker.hostname #set worker_hostname = $worker.hostname
#set worker_ip = $ip_settings[$worker_hostname].mgmt.ip
$worker_ip $worker_hostname $worker_ip $worker_hostname
#end for #end for
# compute # compute
#for worker in $computes #for worker in $computes
#set worker_ip = $worker.install.ip
#set worker_hostname = $worker.hostname #set worker_hostname = $worker.hostname
#set worker_ip = $ip_settings[$worker_hostname].mgmt.ip
$worker_ip $worker_hostname $worker_ip $worker_hostname
#end for #end for

1
conf/templates/ansible_installer/openstack_kilo/vars/HA-ansible-multinodes.tmpl
View File

@ -37,6 +37,7 @@ deploy_type: $getVar('deploy_type', 'virtual')
public_cidr: $computers[0]['install']['subnet'] public_cidr: $computers[0]['install']['subnet']
storage_cidr: "{{ ip_settings[inventory_hostname]['storage']['cidr'] }}" storage_cidr: "{{ ip_settings[inventory_hostname]['storage']['cidr'] }}"
mgmt_cidr: "{{ ip_settings[inventory_hostname]['mgmt']['cidr'] }}"
public_net_info: "{{ network_cfg.public_net_info }}" public_net_info: "{{ network_cfg.public_net_info }}"
host_ip_settings: "{{ ip_settings[inventory_hostname] }}" host_ip_settings: "{{ ip_settings[inventory_hostname] }}"

13
conf/templates/ansible_installer/openstack_liberty/hosts/HA-ansible-multinodes.tmpl
View File

@ -1,3 +1,12 @@
#set ip_settings={}
#for k,v in $getVar('ip_settings', {}).items()
#set host_ip_settings={}
#for intf in v
#set $host_ip_settings[$intf["alias"]]=intf
#end for
#set $ip_settings[$k]=$host_ip_settings
#end for
# localhost # localhost
127.0.0.1 localhost 127.0.0.1 localhost
#set controllers = $getVar('controller', []) #set controllers = $getVar('controller', [])
@ -10,13 +19,13 @@
#end if #end if
# controller # controller
#for worker in $controllers #for worker in $controllers
#set worker_ip = $worker.install.ip
#set worker_hostname = $worker.hostname #set worker_hostname = $worker.hostname
#set worker_ip = $ip_settings[$worker_hostname].mgmt.ip
$worker_ip $worker_hostname $worker_ip $worker_hostname
#end for #end for
# compute # compute
#for worker in $computes #for worker in $computes
#set worker_ip = $worker.install.ip
#set worker_hostname = $worker.hostname #set worker_hostname = $worker.hostname
#set worker_ip = $ip_settings[$worker_hostname].mgmt.ip
$worker_ip $worker_hostname $worker_ip $worker_hostname
#end for #end for

2
conf/templates/ansible_installer/openstack_liberty/vars/HA-ansible-multinodes.tmpl
View File

@ -37,6 +37,8 @@ deploy_type: $getVar('deploy_type', 'virtual')
public_cidr: $computers[0]['install']['subnet'] public_cidr: $computers[0]['install']['subnet']
storage_cidr: "{{ ip_settings[inventory_hostname]['storage']['cidr'] }}" storage_cidr: "{{ ip_settings[inventory_hostname]['storage']['cidr'] }}"
mgmt_cidr: "{{ ip_settings[inventory_hostname]['mgmt']['cidr'] }}"
public_net_info: "{{ network_cfg.public_net_info }}" public_net_info: "{{ network_cfg.public_net_info }}"
host_ip_settings: "{{ ip_settings[inventory_hostname] }}" host_ip_settings: "{{ ip_settings[inventory_hostname] }}"