aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey Zhang <jeffrey.zhang@99cloud.net>2016-02-03 17:22:04 +0800
committerJeffrey Zhang <jeffrey.zhang@99cloud.net>2016-02-12 02:02:34 +0800
commita692718c00e0aeb431a7ea932f9a33ffbede0eae (patch)
tree093d783b6b9078690b25dbdc3818bb9c2f532dd2
parent7899d00c6f46f9d3b65c9284a8f70f4998e2415e (diff)
downloadkolla-a692718c00e0aeb431a7ea932f9a33ffbede0eae.tar.gz
kolla-a692718c00e0aeb431a7ea932f9a33ffbede0eae.zip
Ensuring the openvswitch_db is ready before creating bridges
Change-Id: I42550c57222de4ad5556e95d40bb96528bc1d085 Closes-Bug: #1533942
-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