1 files changed, 18 insertions, 5 deletions
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 8ae9bdba..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')
@@ -160,10 +159,21 @@ CEILOMETER_TOKEN: c095d479023a0fd58a54
 erlang.cookie: DJJVECFMCJPVYQTJTDWG
 
 #set plugins = $getVar('plugins', [])
+#set odl_enable = False
 #for item in plugins
-#set keys = $item.keys()
-#set values = $item.values()
-$keys[0]: $values[0]
+#set key = $item.keys()[0]
+#set value = $item.values()[0]
+#if $key == "opendaylight" and $value == "Enable"
+#set odl_enable = True
+#end if
+$key: $value
+#end for
+
+#set cluster_param = $getVar('cluster_param', [])
+#for item in cluster_param
+#set key = $item.keys()[0]
+#set value = $item.values()[0]
+$key: $value
 #end for
 
 #set neutron_service_plugins=['router']
@@ -189,8 +199,11 @@ NEUTRON_TUNNEL_ID_RANGES: $ovs_config['tunnel_id_ranges']
 NEUTRON_TUNNEL_ID_RANGES: []
 #end if
 
-#NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
+#if odl_enable == True
+NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
+#else
 NEUTRON_MECHANISM_DRIVERS: ['openvswitch']
+#end if
 NEUTRON_TUNNEL_TYPES: ['vxlan']
 METADATA_SECRET: metadata_secret
 WSREP_SST_USER: wsrep_sst