From 4e50e067d7f74aac1dfce6be87c0df4e904e7137 Mon Sep 17 00:00:00 2001
From: Harry Huang <huangxiangyu5@huawei.com>
Date: Fri, 20 Jul 2018 16:51:24 +0800
Subject: Set NEUTRON_MECHANISM_DRIVERS according to ODL plugin

JIRA: COMPASS-604

when ODL plugin is enable, set NEUTRON_MECHANISM_DRIVERS
to opendaylight, otherwise set to openvswitch

Change-Id: I25140990b154bdc772773fdbee95526837431a6e
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
---
 .../vars/HA-ansible-multinodes.tmpl                | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 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 0c9ec062..871850b3 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
@@ -160,18 +160,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
 
-cluster_param:
 #set cluster_param = $getVar('cluster_param', [])
 #for item in cluster_param
-#set keys = $item.keys()
-#set values = $item.values()
-  $keys[0]: $values[0]
+#set key = $item.keys()[0]
+#set value = $item.values()[0]
+$key: $value
 #end for
 
 #set neutron_service_plugins=['router']
@@ -197,8 +200,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
-- 
cgit 1.2.3-korg