Merge "Fixes race condition in ansible playbooks"

This commit is contained in:
Jenkins 2015-08-01 19:32:48 +00:00 committed by Gerrit Code Review
commit 38418befc0
4 changed files with 6 additions and 1 deletions

View File

@ -35,5 +35,4 @@
name: "{{ container_name }}"
image: "{{ container_image }}"
state: "absent"
run_once: True
when: database|changed

View File

@ -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

View File

@ -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

View File

@ -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