diff options
| author | Sean Mooney <sean.k.mooney@intel.com> | 2015-12-02 21:05:16 +0000 |
|---|---|---|
| committer | Sean Mooney <sean.k.mooney@intel.com> | 2015-12-03 20:13:21 +0000 |
| commit | 9ce814619aa951f7d87b14f2ca67e7128ac12d2c (patch) | |
| tree | c493702ac895dbb80cd2d6871de5dbe1b1feae0a /ansible | |
| parent | cb73c6b7c04ffa48d5ee32793b3b5f11f0092caa (diff) | |
| download | kolla-9ce814619aa951f7d87b14f2ca67e7128ac12d2c.tar.gz kolla-9ce814619aa951f7d87b14f2ca67e7128ac12d2c.zip | |
configure ovs bridge in openvswitch-db container
- this change moves the ovs_ensure_configured.sh file to the
openvswitch-db container.
- this change reorders the plays in ansible/roles/neutron/tasks/start.yml
to configure the ovs bridges before starting the vswitchd container.
Change-Id: Ied1a82d48377534c15680406df9a96caf3b79515
Closes-Bug: #1522133
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/neutron/tasks/start.yml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ansible/roles/neutron/tasks/start.yml b/ansible/roles/neutron/tasks/start.yml index b2181196e..5d8d3eaf3 100644 --- a/ansible/roles/neutron/tasks/start.yml +++ b/ansible/roles/neutron/tasks/start.yml @@ -39,6 +39,13 @@ when: (inventory_hostname in groups['compute'] or inventory_hostname in groups['neutron-agents']) and 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 }} + register: status + changed_when: status.stdout.find('changed') != -1 + when: (inventory_hostname in groups['compute'] or inventory_hostname in groups['neutron-agents']) + and neutron_plugin_agent == "openvswitch" + - name: Starting Openvswitch-vswitchd container docker: tty: True @@ -63,13 +70,6 @@ when: (inventory_hostname in groups['compute'] or inventory_hostname in groups['neutron-agents']) and neutron_plugin_agent == "openvswitch" -- name: Ensuring OVS bridge is properly setup - command: docker exec openvswitch_vswitchd /usr/local/bin/kolla_ensure_openvswitch_configured {{ neutron_bridge_name }} {{ neutron_external_interface }} - register: status - changed_when: status.stdout.find('changed') != -1 - when: (inventory_hostname in groups['compute'] or inventory_hostname in groups['neutron-agents']) - and neutron_plugin_agent == "openvswitch" - - name: Starting Neutron-server container docker: tty: True |