From 8e03952c1009353f3e5f898dbb671a7529af80de Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Fri, 31 Jul 2015 21:55:22 +0000 Subject: [PATCH] Fixes race condition in ansible playbooks Bundling in a run_once error that beaks with multinode and the race Change-Id: Ia3779d9a291f8d652fc81fe5ebcab88241805c8d Closes-Bug: #1480468 --- ansible/roles/bootstrap.yml | 1 - ansible/roles/glance/tasks/register.yml | 2 ++ ansible/roles/neutron/tasks/register.yml | 2 ++ ansible/roles/nova/tasks/register.yml | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ansible/roles/bootstrap.yml b/ansible/roles/bootstrap.yml index c5a7e7a62a..4b1aa56626 100644 --- a/ansible/roles/bootstrap.yml +++ b/ansible/roles/bootstrap.yml @@ -35,5 +35,4 @@ name: "{{ container_name }}" image: "{{ container_image }}" state: "absent" - run_once: True when: database|changed diff --git a/ansible/roles/glance/tasks/register.yml b/ansible/roles/glance/tasks/register.yml index 711ea5ff97..cda1ff1827 100644 --- a/ansible/roles/glance/tasks/register.yml +++ b/ansible/roles/glance/tasks/register.yml @@ -10,6 +10,7 @@ public_url: "http://{{ kolla_external_address }}:{{ glance_api_port }}" auth: "{{ openstack_auth_v2 }}" region_name: "{{ openstack_region_name }}" + run_once: True - name: Creating the Glance project, user, and role kolla_keystone_user: @@ -19,3 +20,4 @@ role: "admin" auth: "{{ openstack_auth_v2 }}" region_name: "{{ openstack_region_name }}" + run_once: True diff --git a/ansible/roles/neutron/tasks/register.yml b/ansible/roles/neutron/tasks/register.yml index 1acf4af5ae..9f1d35a400 100644 --- a/ansible/roles/neutron/tasks/register.yml +++ b/ansible/roles/neutron/tasks/register.yml @@ -10,6 +10,7 @@ public_url: "http://{{ kolla_external_address }}:{{ neutron_server_port }}" auth: "{{ openstack_auth_v2 }}" region_name: "{{ openstack_region_name }}" + run_once: True - name: Creating the Neutron project, user, and role kolla_keystone_user: @@ -19,3 +20,4 @@ role: "admin" auth: "{{ openstack_auth_v2 }}" region_name: "{{ openstack_region_name }}" + run_once: True diff --git a/ansible/roles/nova/tasks/register.yml b/ansible/roles/nova/tasks/register.yml index 5ca3d12354..0b976c8c85 100644 --- a/ansible/roles/nova/tasks/register.yml +++ b/ansible/roles/nova/tasks/register.yml @@ -10,6 +10,7 @@ public_url: "http://{{ kolla_external_address }}:{{ nova_api_port }}/v2/%(tenant_id)s" auth: "{{ openstack_auth_v2 }}" region_name: "{{ openstack_region_name }}" + run_once: True - name: Creating the Nova project, user, and role kolla_keystone_user: @@ -19,3 +20,4 @@ role: "admin" auth: "{{ openstack_auth_v2 }}" region_name: "{{ openstack_region_name }}" + run_once: True