aboutsummaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
authorchigang <chigang@huawei.com>2017-08-14 17:26:19 +0800
committerchigang <chigang@huawei.com>2017-08-14 17:26:19 +0800
commit7afdbb1351729dffa7d4bba7a2c505ef707d10c9 (patch)
treec281090a0074e834704f60fd243ba06cdfdc56bb /deploy
parent37db53e73201a46d673a5a52844a8c5d640b9403 (diff)
fix loss of group vars definition
JIRA:- TASK [moon : configure moon.conf for moon slave] fatal: [host5]: FAILED! => {"failed": true, "msg": "'moon_slave_name' is undefined"} https://build.opnfv.org/ci/job/compass-deploy-virtual-daily-master/3311/console Change-Id: Ic6211ef7017e0ed794718f1705ba566af370ea49 Signed-off-by: chigang <chigang@huawei.com>
Diffstat (limited to 'deploy')
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/HA-ansible-multinodes.tmpl8
1 files changed, 7 insertions, 1 deletions
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/HA-ansible-multinodes.tmpl
index 3e68e5a9..d0d0b7d0 100755
--- a/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/HA-ansible-multinodes.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/HA-ansible-multinodes.tmpl
@@ -47,7 +47,6 @@ enable_secgroup: $getVar('enable_secgroup', True)
enable_fwaas: $getVar('enable_fwaas', True)
enable_vpnaas: $getVar('enable_vpnaas', True)
odl_l3_agent: $getVar('odl_l3_agent', 'Disable')
-moon: $getVar('moon', 'Disable')
ha_network: $getVar('ha_network', 'Disable')
onos_nic: $getVar('onos_nic', 'eth2')
onos_sfc: $getVar('onos_sfc', 'Disable')
@@ -232,3 +231,10 @@ odl_base_features: ['config', 'standard', 'region', 'package', 'kar', 'ssh', 'ma
odl_extra_features: ['odl-l2switch-switch', 'odl-ovsdb-plugin', 'odl-ovsdb-openstack', 'odl-ovsdb-northbound','odl-dlux-core', 'odl-restconf-all', 'odl-mdsal-clustering', 'odl-openflowplugin-flow-services', 'odl-netconf-connector', 'odl-netconf-connector-ssh', 'jolokia-osgi']
odl_features: "{{ odl_base_features + odl_extra_features }}"
odl_api_port: 8080
+
+#set moon_cfg = $getVar('moon_cfg', {})
+moon_master: $moon_cfg.master.flag
+moon_slave: $moon_cfg.slave.flag
+moon_slave_name: $moon_cfg.slave.name
+moon_master_ip: $moon_cfg.slave.master_ip
+