Skip to content
Snippets Groups Projects
Commit 1abd15d4 authored by Mark Goddard's avatar Mark Goddard Committed by Radosław Piliszek
Browse files

Fix glance bootstrap with file backend

Change https://review.opendev.org/#/c/670247/ attempted to fix glance
deployment with the file backend. However, it added a new bug by being
more strict about only generating configuration where the container will
be deployed. This means that the current method of running the glance
bootstrap container on any host in glance-api group could be broken,
since it needs the container configuration.

This change only runs the bootstrap container on hosts in the
glance_api_hosts list, which in the case of the file backend typically
only contains one host.

This change also fixes up some logic during rolling upgrade, where we
might not generate new configuration for the bootstrap host.

Change-Id: I83547cd83b06ddefb3a9e1f39844537bdb32bd7f
Related-Bug: #1836151
parent 7a2e08d8
No related branches found
No related tags found
No related merge requests found
--- ---
- name: Enable log_bin_trust_function_creators function - name: Enable log_bin_trust_function_creators function
vars:
glance_api: "{{ glance_services['glance-api'] }}"
become: true become: true
kolla_toolbox: kolla_toolbox:
module_name: mysql_variables module_name: mysql_variables
...@@ -13,7 +11,7 @@ ...@@ -13,7 +11,7 @@
variable: log_bin_trust_function_creators variable: log_bin_trust_function_creators
value: 1 value: 1
run_once: True run_once: True
delegate_to: "{{ groups[glance_api.group][0] }}" delegate_to: "{{ glance_api_hosts[0] }}"
when: when:
- not use_preconfigured_databases | bool - not use_preconfigured_databases | bool
...@@ -35,11 +33,9 @@ ...@@ -35,11 +33,9 @@
restart_policy: "never" restart_policy: "never"
volumes: "{{ glance_api.volumes|reject('equalto', '')|list }}" volumes: "{{ glance_api.volumes|reject('equalto', '')|list }}"
run_once: True run_once: True
delegate_to: "{{ groups[glance_api.group][0] }}" delegate_to: "{{ glance_api_hosts[0] }}"
- name: Disable log_bin_trust_function_creators function - name: Disable log_bin_trust_function_creators function
vars:
glance_api: "{{ glance_services['glance-api'] }}"
become: true become: true
kolla_toolbox: kolla_toolbox:
module_name: mysql_variables module_name: mysql_variables
...@@ -51,6 +47,6 @@ ...@@ -51,6 +47,6 @@
variable: log_bin_trust_function_creators variable: log_bin_trust_function_creators
value: 0 value: 0
run_once: True run_once: True
delegate_to: "{{ groups[glance_api.group][0] }}" delegate_to: "{{ glance_api_hosts[0] }}"
when: when:
- not use_preconfigured_databases | bool - not use_preconfigured_databases | bool
...@@ -4,14 +4,12 @@ ...@@ -4,14 +4,12 @@
# Upgrade first node (NEW NODE in the Glance documentation) # Upgrade first node (NEW NODE in the Glance documentation)
- include_tasks: config.yml - include_tasks: config.yml
when: inventory_hostname == groups["glance-api"][0] when: inventory_hostname == glance_api_hosts[0]
- include_tasks: stop_service.yml - include_tasks: stop_service.yml
when: inventory_hostname == groups["glance-api"][0] when: inventory_hostname == glance_api_hosts[0]
- name: Enable log_bin_trust_function_creators function - name: Enable log_bin_trust_function_creators function
vars:
glance_api: "{{ glance_services['glance-api'] }}"
become: true become: true
kolla_toolbox: kolla_toolbox:
module_name: mysql_variables module_name: mysql_variables
...@@ -23,7 +21,7 @@ ...@@ -23,7 +21,7 @@
variable: log_bin_trust_function_creators variable: log_bin_trust_function_creators
value: 1 value: 1
run_once: True run_once: True
delegate_to: "{{ groups[glance_api.group][0] }}" delegate_to: "{{ glance_api_hosts[0] }}"
when: when:
- not use_preconfigured_databases | bool - not use_preconfigured_databases | bool
...@@ -46,7 +44,7 @@ ...@@ -46,7 +44,7 @@
restart_policy: "never" restart_policy: "never"
volumes: "{{ glance_api.volumes }}" volumes: "{{ glance_api.volumes }}"
run_once: True run_once: True
delegate_to: "{{ groups[glance_api.group][0] }}" delegate_to: "{{ glance_api_hosts[0] }}"
- name: Running Glance database migrate container - name: Running Glance database migrate container
vars: vars:
...@@ -67,13 +65,13 @@ ...@@ -67,13 +65,13 @@
restart_policy: "never" restart_policy: "never"
volumes: "{{ glance_api.volumes }}" volumes: "{{ glance_api.volumes }}"
run_once: True run_once: True
delegate_to: "{{ groups[glance_api.group][0] }}" delegate_to: "{{ glance_api_hosts[0] }}"
notify: notify:
- Restart glance-api container - Restart glance-api container
# Upgrade remaining node # Upgrade remaining node
- include_tasks: config.yml - include_tasks: config.yml
when: inventory_hostname != groups["glance-api"][0] when: inventory_hostname != glance_api_hosts[0]
- name: Flush handlers - name: Flush handlers
meta: flush_handlers meta: flush_handlers
...@@ -97,11 +95,9 @@ ...@@ -97,11 +95,9 @@
restart_policy: "never" restart_policy: "never"
volumes: "{{ glance_api.volumes }}" volumes: "{{ glance_api.volumes }}"
run_once: True run_once: True
delegate_to: "{{ groups[glance_api.group][0] }}" delegate_to: "{{ glance_api_hosts[0] }}"
- name: Disable log_bin_trust_function_creators function - name: Disable log_bin_trust_function_creators function
vars:
glance_api: "{{ glance_services['glance-api'] }}"
become: true become: true
kolla_toolbox: kolla_toolbox:
module_name: mysql_variables module_name: mysql_variables
...@@ -113,7 +109,7 @@ ...@@ -113,7 +109,7 @@
variable: log_bin_trust_function_creators variable: log_bin_trust_function_creators
value: 0 value: 0
run_once: True run_once: True
delegate_to: "{{ groups[glance_api.group][0] }}" delegate_to: "{{ glance_api_hosts[0] }}"
when: when:
- not use_preconfigured_databases | bool - not use_preconfigured_databases | bool
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment