summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/odl_cluster/tasks/control-agents-3.yml5
-rw-r--r--plugins/odl_cluster/tasks/control-servers-2.yml4
2 files changed, 7 insertions, 2 deletions
diff --git a/plugins/odl_cluster/tasks/control-agents-3.yml b/plugins/odl_cluster/tasks/control-agents-3.yml
index 9d7ddebf..68446a83 100644
--- a/plugins/odl_cluster/tasks/control-agents-3.yml
+++ b/plugins/odl_cluster/tasks/control-agents-3.yml
@@ -13,6 +13,11 @@
crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ovs bridge_mappings physnet:eth12;
when: odl_l3_agent == "Enable"
+- name: configure external bridge name for L2
+ shell: |
+ crudini --set /etc/neutron/l3_agent.ini DEFAULT external_network_bridge br-provider;
+ when: odl_l3_agent == "Disable"
+
- name: configure opendaylight in ml2
shell: |
crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2_odl username admin;
diff --git a/plugins/odl_cluster/tasks/control-servers-2.yml b/plugins/odl_cluster/tasks/control-servers-2.yml
index 5bfc24eb..59b3aa2f 100644
--- a/plugins/odl_cluster/tasks/control-servers-2.yml
+++ b/plugins/odl_cluster/tasks/control-servers-2.yml
@@ -19,9 +19,9 @@
crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ovs bridge_mappings physnet:eth12;
when: odl_l3_agent == "Enable"
-- name: configure external bridge name for L2
+- name: turn off l3 ha for odl l2
shell: |
- crudini --set /etc/neutron/l3_agent.ini DEFAULT external_network_bridge br-provider;
+ crudini --set /etc/neutron/neutron.conf DEFAULT l3_ha "False";
when: odl_l3_agent == "Disable"
- name: configure opendaylight in ml2