aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarry Huang <huangxiangyu5@huawei.com>2018-07-23 02:02:14 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-07-23 02:02:14 +0000
commit2f55e496b03038296b59d4fb2c0dbf1af3223226 (patch)
treec454fadbf3a5cbf5f292a6ad23acca60a3cb5707
parentf507b0e1399bf86adc0ebe7272c89313b7ad3a43 (diff)
parent4e50e067d7f74aac1dfce6be87c0df4e904e7137 (diff)
Merge "Set NEUTRON_MECHANISM_DRIVERS according to ODL plugin"
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_queens/vars/HA-ansible-multinodes.tmpl22
1 files 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