From: Harry Huang Date: Fri, 31 Aug 2018 06:57:42 +0000 (+0800) Subject: Remove duplicate varible X-Git-Tag: opnfv-7.0.0~11 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3a24c12eea062ed00970c07e0441779ea74cb509;p=compass4nfv.git Remove duplicate varible JIRA: - Varible odl_l3_agent now will be specified as a cluster parameter. Get rid of the unnecessary varible declaration. Change-Id: I56a7c92033c1f3958a24f99eef893e4427cd3daf Signed-off-by: Harry Huang --- diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_queens/vars/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_queens/vars/HA-ansible-multinodes.tmpl index 871850b3..202f86bb 100755 --- a/deploy/compass_conf/templates/ansible_installer/openstack_queens/vars/HA-ansible-multinodes.tmpl +++ b/deploy/compass_conf/templates/ansible_installer/openstack_queens/vars/HA-ansible-multinodes.tmpl @@ -62,7 +62,6 @@ run_dir: $getVar('run_dir', '') 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') ha_network: $getVar('ha_network', 'Disable') onos_nic: $getVar('onos_nic', 'eth2') onos_sfc: $getVar('onos_sfc', 'Disable')