diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-01 19:32:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-01 19:32:48 +0000 |
| commit | 38418befc0943e22d7ffb494c9e51264c5cac16c (patch) | |
| tree | 5a85116a0e3fe112a3e80fb67de54a07e0f7e5f0 | |
| parent | a44b0a4b9fc1e65c2fb56d49cc45211f6534d056 (diff) | |
| parent | 8e03952c1009353f3e5f898dbb671a7529af80de (diff) | |
| download | kolla-38418befc0943e22d7ffb494c9e51264c5cac16c.tar.gz kolla-38418befc0943e22d7ffb494c9e51264c5cac16c.zip | |
Merge "Fixes race condition in ansible playbooks"
| -rw-r--r-- | ansible/roles/bootstrap.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/glance/tasks/register.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/neutron/tasks/register.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/nova/tasks/register.yml | 2 |
4 files changed, 6 insertions, 1 deletions
diff --git a/ansible/roles/bootstrap.yml b/ansible/roles/bootstrap.yml index c5a7e7a62..4b1aa5662 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 711ea5ff9..cda1ff182 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 1acf4af5a..9f1d35a40 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 5ca3d1235..0b976c8c8 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 |