aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-02-12 01:49:22 +0000
committerGerrit Code Review <review@openstack.org>2016-02-12 01:49:22 +0000
commitba6326a1203a3e3339a2369361c2013548866ec7 (patch)
treea0649be41712da70dadf743a685a5731722e2261
parent8ad0b110657b2be1347b467236a74ed96aae0d02 (diff)
parenta692718c00e0aeb431a7ea932f9a33ffbede0eae (diff)
downloadkolla-ba6326a1203a3e3339a2369361c2013548866ec7.tar.gz
kolla-ba6326a1203a3e3339a2369361c2013548866ec7.zip
Merge "Ensuring the openvswitch_db is ready before creating bridges"
-rw-r--r--ansible/roles/neutron/tasks/start.yml14
1 files changed, 14 insertions, 0 deletions
diff --git a/ansible/roles/neutron/tasks/start.yml b/ansible/roles/neutron/tasks/start.yml
index 00de60135..5bdb2f7f5 100644
--- a/ansible/roles/neutron/tasks/start.yml
+++ b/ansible/roles/neutron/tasks/start.yml
@@ -16,6 +16,20 @@
or inventory_hostname in groups['neutron-metadata-agent'])
- neutron_plugin_agent == "openvswitch"
+- name: Waiting the openvswtich_db service to be ready
+ command: docker exec openvswitch_db ovs-vsctl --no-wait show
+ register: check_result
+ until: check_result | success
+ changed_when: False
+ retries: 30
+ delay: 2
+ when:
+ - (inventory_hostname in groups['compute']
+ or inventory_hostname in groups['neutron-dhcp-agent']
+ or inventory_hostname in groups['neutron-l3-agent']
+ or inventory_hostname in groups['neutron-metadata-agent'])
+ - 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