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
This commit is contained in:
parent
55c3e0252e
commit
6d8959a962
ansible/roles
ceph/tasks
cinder/tasks
glance/tasks
heat/tasks
ironic/tasks
keystone/tasks
magnum/tasks
mariadb/tasks
mistral/tasks
murano/tasks
neutron/tasks
nova/tasks
rabbitmq/tasks
@ -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"
|
||||
|
@ -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:
|
||||
|
@ -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
|
||||
|
@ -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:
|
||||
|
@ -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
|
||||
|
@ -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:
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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:
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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:
|
||||
|
@ -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"
|
||||
|
Loading…
x
Reference in New Issue
Block a user