From 6d8959a962c038269653b00ba7ddb491c597e49a Mon Sep 17 00:00:00 2001 From: SamYaple Date: Thu, 28 Jan 2016 02:04:02 +0000 Subject: [PATCH] Update all bootstraps to use Label Add bootstrap label to all bootstrap containers to ensure that when the a new container is launched a difference is seen between it and the bootstrap container since we cannot rely on ENV variables for this. This only affects mariadb at this stage, but it is needed to ensure rabbitmq works when we switch to named volumes. Change-Id: Ia022af26212d2e5445c06149848831037a508407 Closes-Bug: #1538136 --- ansible/roles/ceph/tasks/bootstrap_osds.yml | 4 ++++ ansible/roles/ceph/tasks/generate_cluster.yml | 2 ++ ansible/roles/cinder/tasks/bootstrap.yml | 4 +++- ansible/roles/glance/tasks/bootstrap.yml | 2 ++ ansible/roles/heat/tasks/bootstrap.yml | 2 ++ ansible/roles/ironic/tasks/bootstrap.yml | 4 ++++ ansible/roles/keystone/tasks/bootstrap_service.yml | 2 ++ ansible/roles/magnum/tasks/bootstrap.yml | 2 ++ ansible/roles/mariadb/tasks/bootstrap.yml | 2 ++ ansible/roles/mistral/tasks/bootstrap.yml | 2 ++ ansible/roles/murano/tasks/bootstrap.yml | 2 ++ ansible/roles/neutron/tasks/bootstrap.yml | 2 ++ ansible/roles/nova/tasks/bootstrap.yml | 8 ++++++-- ansible/roles/rabbitmq/tasks/bootstrap.yml | 2 ++ 14 files changed, 37 insertions(+), 3 deletions(-) diff --git a/ansible/roles/ceph/tasks/bootstrap_osds.yml b/ansible/roles/ceph/tasks/bootstrap_osds.yml index 20b5bdaacd..7cd143a3f4 100644 --- a/ansible/roles/ceph/tasks/bootstrap_osds.yml +++ b/ansible/roles/ceph/tasks/bootstrap_osds.yml @@ -34,6 +34,8 @@ OSD_DEV: "{{ item.1.device }}" OSD_INITIAL_WEIGHT: "{{ osd_initial_weight }}" image: "{{ ceph_osd_image_full }}" + labels: + BOOTSTRAP: name: "bootstrap_osd_{{ item.0 }}" privileged: True restart_policy: "never" @@ -54,6 +56,8 @@ OSD_DEV: "{{ item.1.device }}" OSD_INITIAL_WEIGHT: "{{ osd_initial_weight }}" image: "{{ ceph_osd_image_full }}" + labels: + BOOTSTRAP: name: "bootstrap_osd_cache_{{ item.0 }}" privileged: True restart_policy: "never" diff --git a/ansible/roles/ceph/tasks/generate_cluster.yml b/ansible/roles/ceph/tasks/generate_cluster.yml index 06797b40f7..1556e08c3e 100644 --- a/ansible/roles/ceph/tasks/generate_cluster.yml +++ b/ansible/roles/ceph/tasks/generate_cluster.yml @@ -9,6 +9,8 @@ KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" MON_IP: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}" image: "{{ ceph_mon_image_full }}" + labels: + BOOTSTRAP: name: "bootstrap_ceph_mon" restart_policy: "never" volumes: diff --git a/ansible/roles/cinder/tasks/bootstrap.yml b/ansible/roles/cinder/tasks/bootstrap.yml index adafe20685..be7966d56f 100644 --- a/ansible/roles/cinder/tasks/bootstrap.yml +++ b/ansible/roles/cinder/tasks/bootstrap.yml @@ -43,8 +43,10 @@ environment: KOLLA_BOOTSTRAP: KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" - name: "bootstrap_cinder" image: "{{ cinder_api_image_full }}" + labels: + BOOTSTRAP: + name: "bootstrap_cinder" restart_policy: "never" volumes: "{{ node_config_directory }}/cinder-api/:{{ container_config_directory }}/:ro" run_once: True diff --git a/ansible/roles/glance/tasks/bootstrap.yml b/ansible/roles/glance/tasks/bootstrap.yml index e06014ba42..2ac9b696f8 100644 --- a/ansible/roles/glance/tasks/bootstrap.yml +++ b/ansible/roles/glance/tasks/bootstrap.yml @@ -45,6 +45,8 @@ KOLLA_BOOTSTRAP: KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" image: "{{ glance_api_image_full }}" + labels: + BOOTSTRAP: name: "bootstrap_glance" restart_policy: "never" volumes: diff --git a/ansible/roles/heat/tasks/bootstrap.yml b/ansible/roles/heat/tasks/bootstrap.yml index fb23a6c36b..ccf0cc2343 100644 --- a/ansible/roles/heat/tasks/bootstrap.yml +++ b/ansible/roles/heat/tasks/bootstrap.yml @@ -50,6 +50,8 @@ OS_PROJECT_NAME: "{{ openstack_auth.project_name }}" HEAT_DOMAIN_ADMIN_PASSWORD: "{{ heat_domain_admin_password }}" image: "{{ heat_api_image_full }}" + labels: + BOOTSTRAP: name: "bootstrap_heat" volumes: "{{ node_config_directory }}/heat-api/:{{ container_config_directory }}/:ro" run_once: True diff --git a/ansible/roles/ironic/tasks/bootstrap.yml b/ansible/roles/ironic/tasks/bootstrap.yml index 7217c4f29c..4a4b9ee4b1 100644 --- a/ansible/roles/ironic/tasks/bootstrap.yml +++ b/ansible/roles/ironic/tasks/bootstrap.yml @@ -46,6 +46,8 @@ KOLLA_BOOTSTRAP: KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" image: "{{ ironic_api_image_full }}" + labels: + BOOTSTRAP: name: "bootstrap_ironic" restart_policy: "never" volumes: "{{ node_config_directory }}/ironic-api/:{{ container_config_directory }}/:ro" @@ -62,6 +64,8 @@ KOLLA_BOOTSTRAP: KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" image: "{{ ironic_pxe_image_full }}" + labels: + BOOTSTRAP: name: "bootstrap_ironic_pxe" restart_policy: "never" volumes: diff --git a/ansible/roles/keystone/tasks/bootstrap_service.yml b/ansible/roles/keystone/tasks/bootstrap_service.yml index 6b8ad2bfa9..b522ea0366 100644 --- a/ansible/roles/keystone/tasks/bootstrap_service.yml +++ b/ansible/roles/keystone/tasks/bootstrap_service.yml @@ -8,6 +8,8 @@ KOLLA_BOOTSTRAP: KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" image: "{{ keystone_image_full }}" + labels: + BOOTSTRAP: name: "bootstrap_keystone" restart_policy: "never" volumes: "{{ node_config_directory }}/keystone/:{{ container_config_directory }}/:ro" diff --git a/ansible/roles/magnum/tasks/bootstrap.yml b/ansible/roles/magnum/tasks/bootstrap.yml index e72df328b7..09bc619615 100644 --- a/ansible/roles/magnum/tasks/bootstrap.yml +++ b/ansible/roles/magnum/tasks/bootstrap.yml @@ -44,6 +44,8 @@ KOLLA_BOOTSTRAP: KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" image: "{{ magnum_api_image_full }}" + labels: + BOOTSTRAP: name: "bootstrap_magnum" restart_policy: "never" volumes: "{{ node_config_directory }}/magnum-api/:{{ container_config_directory }}/:ro" diff --git a/ansible/roles/mariadb/tasks/bootstrap.yml b/ansible/roles/mariadb/tasks/bootstrap.yml index ac8254a35b..aef9392267 100644 --- a/ansible/roles/mariadb/tasks/bootstrap.yml +++ b/ansible/roles/mariadb/tasks/bootstrap.yml @@ -44,6 +44,8 @@ DB_ROOT_PASSWORD: "{{ database_password }}" DB_MAX_TIMEOUT: "{{ database_max_timeout }}" image: "{{ mariadb_image_full }}" + labels: + BOOTSTRAP: name: "mariadb" restart_policy: "never" volumes: diff --git a/ansible/roles/mistral/tasks/bootstrap.yml b/ansible/roles/mistral/tasks/bootstrap.yml index 0373842a5e..ec2f251e22 100644 --- a/ansible/roles/mistral/tasks/bootstrap.yml +++ b/ansible/roles/mistral/tasks/bootstrap.yml @@ -45,6 +45,8 @@ KOLLA_BOOTSTRAP: KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" image: "{{ mistral_api_image_full }}" + labels: + BOOTSTRAP: name: "bootstrap_mistral" restart_policy: "never" volumes: "{{ node_config_directory }}/mistral-api/:{{ container_config_directory }}/:ro" diff --git a/ansible/roles/murano/tasks/bootstrap.yml b/ansible/roles/murano/tasks/bootstrap.yml index 7c58727bb6..0d07a0cec2 100644 --- a/ansible/roles/murano/tasks/bootstrap.yml +++ b/ansible/roles/murano/tasks/bootstrap.yml @@ -45,6 +45,8 @@ KOLLA_BOOTSTRAP: KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" image: "{{ murano_api_image_full }}" + labels: + BOOTSTRAP: name: "bootstrap_murano" restart_policy: "never" volumes: "{{ node_config_directory }}/murano-api/:{{ container_config_directory }}/:ro" diff --git a/ansible/roles/neutron/tasks/bootstrap.yml b/ansible/roles/neutron/tasks/bootstrap.yml index db1654fa2b..ba63dc685d 100644 --- a/ansible/roles/neutron/tasks/bootstrap.yml +++ b/ansible/roles/neutron/tasks/bootstrap.yml @@ -44,6 +44,8 @@ KOLLA_BOOTSTRAP: KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" image: "{{ neutron_server_image_full }}" + labels: + BOOTSTRAP: name: "bootstrap_neutron" restart_policy: "never" volumes: "{{ node_config_directory }}/neutron-server/:{{ container_config_directory }}/:ro" diff --git a/ansible/roles/nova/tasks/bootstrap.yml b/ansible/roles/nova/tasks/bootstrap.yml index fcdd2a7078..9f874efd50 100644 --- a/ansible/roles/nova/tasks/bootstrap.yml +++ b/ansible/roles/nova/tasks/bootstrap.yml @@ -35,7 +35,7 @@ run_once: True delegate_to: "{{ groups['nova-api'][0] }}" -- name: Starting Nova bootstrap container +- name: Running Nova bootstrap container kolla_docker: action: "start_container" common_options: "{{ docker_common_options }}" @@ -44,6 +44,8 @@ KOLLA_BOOTSTRAP: KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" image: "{{ nova_api_image_full }}" + labels: + BOOTSTRAP: name: "bootstrap_nova" restart_policy: "never" volumes: "{{ node_config_directory }}/nova-api/:{{ container_config_directory }}/:ro" @@ -61,7 +63,7 @@ - inventory_hostname in groups['compute'] - not enable_nova_fake | bool -- name: Starting Nova compute bootstrap container +- name: Running Nova compute bootstrap container kolla_docker: action: "start_container" common_options: "{{ docker_common_options }}" @@ -70,6 +72,8 @@ KOLLA_BOOTSTRAP: KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" image: "{{ nova_compute_image_full }}" + labels: + BOOTSTRAP: name: "bootstrap_nova_compute" restart_policy: "never" volumes: diff --git a/ansible/roles/rabbitmq/tasks/bootstrap.yml b/ansible/roles/rabbitmq/tasks/bootstrap.yml index 8567ce6aa3..c0f8343753 100644 --- a/ansible/roles/rabbitmq/tasks/bootstrap.yml +++ b/ansible/roles/rabbitmq/tasks/bootstrap.yml @@ -25,6 +25,8 @@ KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" RABBITMQ_CLUSTER_COOKIE: "{{ rabbitmq_cluster_cookie }}" image: "{{ rabbitmq_image_full }}" + labels: + BOOTSTRAP: name: "rabbitmq_bootstrap" restart_policy: "never" volumes: "{{ node_config_directory }}/rabbitmq/:{{ container_config_directory }}/:ro"