aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/odl_cluster
diff options
context:
space:
mode:
authorYifei Xue <xueyifei@huawei.com>2017-07-11 13:03:07 +0800
committerYifei Xue <xueyifei@huawei.com>2017-07-12 22:47:43 +0800
commit9829c4894bd2d2a488b3ac71ec049b53377cfe6b (patch)
treeb4a3cd4b0878ebbf132376c08212b0f82938a0e9 /plugins/odl_cluster
parenta0edd1b2b4d4df6fc5c3e773eba66224930fdb46 (diff)
Bug fix for odl_l2
The "external_network_bridge" should be configured in neutron-server's LXC container. Currently we configure it in agents' LXC container. So in ODL L2 scenario, the DNAT failed. This patch will fix this. Change-Id: Ifca005d8cdb901d114838ec88d2f24bcee73abf7 Signed-off-by: Yifei Xue <xueyifei@huawei.com>
Diffstat (limited to 'plugins/odl_cluster')
-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