diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-21 20:05:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-21 20:05:45 +0000 |
| commit | bb617a67ffe21e51bd891771b6dc272cdad04a2e (patch) | |
| tree | 0d6cbae520f6c80c6a1e5f9b3fceac90b416b694 | |
| parent | b32d7ce8028c5f4bb8749ce18fcfeb3f956601b9 (diff) | |
| parent | d1673ad173ea96c0e018946f54caa99776855cc1 (diff) | |
| download | kolla-bb617a67ffe21e51bd891771b6dc272cdad04a2e.tar.gz kolla-bb617a67ffe21e51bd891771b6dc272cdad04a2e.zip | |
Merge "Allow operators to provision multiple physical networks"
| -rw-r--r-- | ansible/roles/neutron/tasks/start.yml | 5 | ||||
| -rw-r--r-- | releasenotes/notes/multiple-physical-networks-f2de7444f7e2d145.yaml | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ansible/roles/neutron/tasks/start.yml b/ansible/roles/neutron/tasks/start.yml index fbccfaf60..e90d4a176 100644 --- a/ansible/roles/neutron/tasks/start.yml +++ b/ansible/roles/neutron/tasks/start.yml @@ -37,7 +37,7 @@ - neutron_plugin_agent == "openvswitch" - name: Ensuring OVS bridge is properly setup - command: docker exec openvswitch_db /usr/local/bin/kolla_ensure_openvswitch_configured {{ neutron_bridge_name }} {{ neutron_external_interface }} + command: docker exec openvswitch_db /usr/local/bin/kolla_ensure_openvswitch_configured {{ item.0 }} {{ item.1 }} register: status changed_when: status.stdout.find('changed') != -1 when: @@ -48,6 +48,9 @@ or inventory_hostname in groups['neutron-metadata-agent'] or inventory_hostname in groups['neutron-vpnaas-agent']) - neutron_plugin_agent == "openvswitch" + with_together: + - "{{ neutron_bridge_name.split(',') }}" + - "{{ neutron_external_interface.split(',') }}" - name: Starting openvswitch-vswitchd container kolla_docker: diff --git a/releasenotes/notes/multiple-physical-networks-f2de7444f7e2d145.yaml b/releasenotes/notes/multiple-physical-networks-f2de7444f7e2d145.yaml new file mode 100644 index 000000000..b628be392 --- /dev/null +++ b/releasenotes/notes/multiple-physical-networks-f2de7444f7e2d145.yaml @@ -0,0 +1,5 @@ +--- +features: + - Fix the implementation of Neutron physical network + provisioning, operators can now configure multiple + physical networks using augmentation files. |