openstack/kolla-ansible
Code Issues Proposed changes

Merge "bootstrap takes place on the wrong node"

Browse Source
This commit is contained in:
Jenkins 2015-11-06 03:32:36 +00:00 committed by Gerrit Code Review
commit 037bdca42d
8 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ansible/roles/cinder/tasks/bootstrap.yml
View File

@ -64,15 +64,19 @@
KOLLA_BOOTSTRAP: KOLLA_BOOTSTRAP:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
run_once: True run_once: True
when: database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed when:
- database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed
- inventory_hostname in groups['cinder-api']
# https://github.com/ansible/ansible-modules-core/pull/1031 # https://github.com/ansible/ansible-modules-core/pull/1031
- name: Waiting for bootstrap container to exit - name: Waiting for bootstrap container to exit
command: docker wait bootstrap_cinder command: docker wait bootstrap_cinder
when: database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed
failed_when: bootstrap_result.stdout != "0" failed_when: bootstrap_result.stdout != "0"
register: bootstrap_result register: bootstrap_result
run_once: True run_once: True
when:
- database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed
- inventory_hostname in groups['cinder-api']
- name: Cleaning up Cinder bootstrap container - name: Cleaning up Cinder bootstrap container
docker: docker:

8
ansible/roles/glance/tasks/bootstrap.yml
View File

@ -65,7 +65,9 @@
KOLLA_BOOTSTRAP: KOLLA_BOOTSTRAP:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
run_once: True run_once: True
when: database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed when:
- database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed
- inventory_hostname in groups['glance-api']
# https://github.com/ansible/ansible-modules-core/pull/1031 # https://github.com/ansible/ansible-modules-core/pull/1031
- name: Waiting for bootstrap container to exit - name: Waiting for bootstrap container to exit
@ -73,7 +75,9 @@
register: bootstrap_result register: bootstrap_result
run_once: True run_once: True
failed_when: bootstrap_result.stdout != "0" failed_when: bootstrap_result.stdout != "0"
when: database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed when:
- database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed
- inventory_hostname in groups['glance-api']
- name: Cleaning up Glance bootstrap container - name: Cleaning up Glance bootstrap container
docker: docker:

4
ansible/roles/haproxy/templates/haproxy.cfg.j2
View File

@ -59,13 +59,13 @@ listen keystone_admin
{% if enable_glance | bool %} {% if enable_glance | bool %}
listen glance_registry listen glance_registry
bind {{ kolla_internal_address }}:{{ glance_registry_port }} bind {{ kolla_internal_address }}:{{ glance_registry_port }}
{% for host in groups['glance'] %} {% for host in groups['glance-registry'] %}
server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + api_interface]['ipv4']['address'] }}:{{ glance_registry_port }} check inter 2000 rise 2 fall 5 server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + api_interface]['ipv4']['address'] }}:{{ glance_registry_port }} check inter 2000 rise 2 fall 5
{% endfor %} {% endfor %}
listen glance_api listen glance_api
bind {{ kolla_internal_address }}:{{ glance_api_port }} bind {{ kolla_internal_address }}:{{ glance_api_port }}
{% for host in groups['glance'] %} {% for host in groups['glance-api'] %}
server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + api_interface]['ipv4']['address'] }}:{{ glance_api_port }} check inter 2000 rise 2 fall 5 server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + api_interface]['ipv4']['address'] }}:{{ glance_api_port }} check inter 2000 rise 2 fall 5
{% endfor %} {% endfor %}
{% endif %} {% endif %}

8
ansible/roles/heat/tasks/bootstrap.yml
View File

@ -52,7 +52,9 @@
OS_PROJECT_NAME: "{{ openstack_auth.project_name }}" OS_PROJECT_NAME: "{{ openstack_auth.project_name }}"
HEAT_DOMAIN_ADMIN_PASSWORD: "{{ heat_domain_admin_password }}" HEAT_DOMAIN_ADMIN_PASSWORD: "{{ heat_domain_admin_password }}"
run_once: True run_once: True
when: database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed when:
- database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed
- inventory_hostname in groups['heat-api']
# https://github.com/ansible/ansible-modules-core/pull/1031 # https://github.com/ansible/ansible-modules-core/pull/1031
- name: Waiting for bootstrap container to exit - name: Waiting for bootstrap container to exit
@ -60,7 +62,9 @@
register: bootstrap_result register: bootstrap_result
run_once: True run_once: True
failed_when: bootstrap_result.stdout != "0" failed_when: bootstrap_result.stdout != "0"
when: database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed when:
- database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed
- inventory_hostname in groups['heat-api']
- name: Cleaning up Heat boostrap container - name: Cleaning up Heat boostrap container
docker: docker:

8
ansible/roles/ironic/tasks/bootstrap.yml
View File

@ -48,13 +48,17 @@
KOLLA_BOOTSTRAP: KOLLA_BOOTSTRAP:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
run_once: True run_once: True
when: database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed when:
- database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed
- inventory_hostname in groups['ironic-api']
# https://github.com/ansible/ansible-modules-core/pull/1031 # https://github.com/ansible/ansible-modules-core/pull/1031
- name: Waiting for Ironic bootstrap container to exit - name: Waiting for Ironic bootstrap container to exit
command: docker wait bootstrap_ironic command: docker wait bootstrap_ironic
run_once: True run_once: True
when: database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed when:
- database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed
- inventory_hostname in groups['ironic-api']
- name: Cleaning up boostrap container - name: Cleaning up boostrap container
docker: docker:

8
ansible/roles/murano/tasks/bootstrap.yml
View File

@ -47,13 +47,17 @@
KOLLA_BOOTSTRAP: KOLLA_BOOTSTRAP:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
run_once: True run_once: True
when: database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed when:
- database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed
- inventory_hostname in groups['murano-api']
# https://github.com/ansible/ansible-modules-core/pull/1031 # https://github.com/ansible/ansible-modules-core/pull/1031
- name: Waiting for bootstrap container to exit - name: Waiting for bootstrap container to exit
command: docker wait bootstrap_murano command: docker wait bootstrap_murano
run_once: True run_once: True
when: database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed when:
- database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed
- inventory_hostname in groups['murano-api']
- name: Cleaning up Murano boostrap container - name: Cleaning up Murano boostrap container
docker: docker:

8
ansible/roles/neutron/tasks/bootstrap.yml
View File

@ -46,7 +46,9 @@
KOLLA_BOOTSTRAP: KOLLA_BOOTSTRAP:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
run_once: True run_once: True
when: database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed when:
- database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed
- inventory_hostname in groups['neutron-server']
# https://github.com/ansible/ansible-modules-core/pull/1031 # https://github.com/ansible/ansible-modules-core/pull/1031
- name: Waiting for bootstrap container to exit - name: Waiting for bootstrap container to exit
@ -54,7 +56,9 @@
register: bootstrap_result register: bootstrap_result
run_once: True run_once: True
failed_when: bootstrap_result.stdout != "0" failed_when: bootstrap_result.stdout != "0"
when: database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed when:
- database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed
- inventory_hostname in groups['neutron-server']
- name: Cleaning up Neutron bootstrap container - name: Cleaning up Neutron bootstrap container
docker: docker:

8
ansible/roles/nova/tasks/bootstrap.yml
View File

@ -64,7 +64,9 @@
KOLLA_BOOTSTRAP: KOLLA_BOOTSTRAP:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
run_once: True run_once: True
when: database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed when:
- database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed
- inventory_hostname in groups['nova-api']
# https://github.com/ansible/ansible-modules-core/pull/1031 # https://github.com/ansible/ansible-modules-core/pull/1031
- name: Waiting for bootstrap container to exit - name: Waiting for bootstrap container to exit
@ -72,7 +74,9 @@
register: bootstrap_result register: bootstrap_result
run_once: True run_once: True
failed_when: bootstrap_result.stdout != "0" failed_when: bootstrap_result.stdout != "0"
when: database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed when:
- database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed
- inventory_hostname in groups['nova-api']
- name: Cleaning up Nova bootstrap container - name: Cleaning up Nova bootstrap container
docker: docker: