diff options
| author |   Yifei Xue <xueyifei@huawei.com> | 2017-07-10 23:10:14 +0800 |
|---|---|---|
| committer | Yifei Xue <xueyifei@huawei.com> | 2017-07-10 23:10:14 +0800 |
| commit | 264ec7332c84617e95f2b7336dcee1a413bc7e6b (patch) | |
| tree | 9fbca3e25b03d79b06754261c93cd848c07d59a7 /plugins/odl_cluster/tasks | |
| parent | a7fed3be428eddf64f626c52ef35cf691c68e431 (diff) | |
Bug fix for physnet name in ODL
The physnet name used in ODL should be the same the one used in
those none odl scenarios.
Change-Id: I5afc9196d8365b649eb088f29bac4f94d9d12d16
Signed-off-by: Yifei Xue <xueyifei@huawei.com>
Diffstat (limited to 'plugins/odl_cluster/tasks')
| -rw-r--r-- | plugins/odl_cluster/tasks/control-agents-2.yml | 10 | ||||
| -rw-r--r-- | plugins/odl_cluster/tasks/control-agents-3.yml | 4 | ||||
| -rw-r--r-- | plugins/odl_cluster/tasks/control-servers-2.yml | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/plugins/odl_cluster/tasks/control-agents-2.yml b/plugins/odl_cluster/tasks/control-agents-2.yml index b138dc38..f53a3ac8 100644 --- a/plugins/odl_cluster/tasks/control-agents-2.yml +++ b/plugins/odl_cluster/tasks/control-agents-2.yml @@ -43,7 +43,7 @@ - name: set external nic in openvswitch shell: | ovs-vsctl set Open_vSwitch $(ovs-vsctl show | head -n 1) \ - other_config:provider_mappings=physnet1:br-provider + other_config:provider_mappings=physnet:br-provider when: - odl_l3_agent == "Disable" - inventory_hostname not in groups['nova_compute'] @@ -51,14 +51,14 @@ - name: set external nic in openvswitch shell: | ovs-vsctl set Open_vSwitch $(ovs-vsctl show | head -n 1) \ - other_config:provider_mappings=physnet1:eth12 + other_config:provider_mappings=physnet:eth12 when: - odl_l3_agent == "Enable" - name: Set host OVS configurations command: | /openstack/venvs/neutron-15.1.4/bin/neutron-odl-ovs-hostconfig \ - --datapath_type=system --bridge_mappings=physnet1:br-provider + --datapath_type=system --bridge_mappings=physnet:br-provider when: - inventory_hostname not in groups['nova_compute'] - odl_l3_agent == "Disable" @@ -66,7 +66,7 @@ - name: Set host OVS configurations command: | /openstack/venvs/neutron-15.1.4/bin/neutron-odl-ovs-hostconfig - --datapath_type=system --bridge_mappings=physnet1:eth12 + --datapath_type=system --bridge_mappings=physnet:eth12 when: - inventory_hostname not in groups['nova_compute'] - odl_l3_agent == "Enable" @@ -81,7 +81,7 @@ - name: Set host OVS configurations command: | /openstack/venvs/neutron-15.1.4/bin/neutron-odl-ovs-hostconfig - --datapath_type=system --bridge_mappings=physnet1:eth12 + --datapath_type=system --bridge_mappings=physnet:eth12 when: - inventory_hostname in groups['nova_compute'] - odl_l3_agent == "Enable" diff --git a/plugins/odl_cluster/tasks/control-agents-3.yml b/plugins/odl_cluster/tasks/control-agents-3.yml index 66a0873f..9d7ddebf 100644 --- a/plugins/odl_cluster/tasks/control-agents-3.yml +++ b/plugins/odl_cluster/tasks/control-agents-3.yml @@ -6,11 +6,11 @@ crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 tenant_network_types vxlan; crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ovs enable_tunneling "True"; crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 extension_drivers port_security; - crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ovs bridge_mappings physnet1:br-provider; + crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ovs bridge_mappings physnet:br-provider; - name: configure bridge_mappings for L3 shell: | - crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ovs bridge_mappings physnet1:eth12; + crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ovs bridge_mappings physnet:eth12; when: odl_l3_agent == "Enable" - name: configure opendaylight in ml2 diff --git a/plugins/odl_cluster/tasks/control-servers-2.yml b/plugins/odl_cluster/tasks/control-servers-2.yml index d19d2db1..5bfc24eb 100644 --- a/plugins/odl_cluster/tasks/control-servers-2.yml +++ b/plugins/odl_cluster/tasks/control-servers-2.yml @@ -12,11 +12,11 @@ crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 tenant_network_types vxlan; crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ovs enable_tunneling "True"; crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 extension_drivers port_security; - crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ovs bridge_mappings physnet1:br-provider; + crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ovs bridge_mappings physnet:br-provider; - name: configure bridge_mappings for L3 shell: | - crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ovs bridge_mappings physnet1:eth12; + 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 |