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
This commit is contained in:
parent
7a2e08d828
commit
1abd15d4a6
@ -1,7 +1,5 @@
|
||||
---
|
||||
- name: Enable log_bin_trust_function_creators function
|
||||
vars:
|
||||
glance_api: "{{ glance_services['glance-api'] }}"
|
||||
become: true
|
||||
kolla_toolbox:
|
||||
module_name: mysql_variables
|
||||
@ -13,7 +11,7 @@
|
||||
variable: log_bin_trust_function_creators
|
||||
value: 1
|
||||
run_once: True
|
||||
delegate_to: "{{ groups[glance_api.group][0] }}"
|
||||
delegate_to: "{{ glance_api_hosts[0] }}"
|
||||
when:
|
||||
- not use_preconfigured_databases | bool
|
||||
|
||||
@ -35,11 +33,9 @@
|
||||
restart_policy: "never"
|
||||
volumes: "{{ glance_api.volumes|reject('equalto', '')|list }}"
|
||||
run_once: True
|
||||
delegate_to: "{{ groups[glance_api.group][0] }}"
|
||||
delegate_to: "{{ glance_api_hosts[0] }}"
|
||||
|
||||
- name: Disable log_bin_trust_function_creators function
|
||||
vars:
|
||||
glance_api: "{{ glance_services['glance-api'] }}"
|
||||
become: true
|
||||
kolla_toolbox:
|
||||
module_name: mysql_variables
|
||||
@ -51,6 +47,6 @@
|
||||
variable: log_bin_trust_function_creators
|
||||
value: 0
|
||||
run_once: True
|
||||
delegate_to: "{{ groups[glance_api.group][0] }}"
|
||||
delegate_to: "{{ glance_api_hosts[0] }}"
|
||||
when:
|
||||
- not use_preconfigured_databases | bool
|
||||
|
@ -4,14 +4,12 @@
|
||||
|
||||
# Upgrade first node (NEW NODE in the Glance documentation)
|
||||
- include_tasks: config.yml
|
||||
when: inventory_hostname == groups["glance-api"][0]
|
||||
when: inventory_hostname == glance_api_hosts[0]
|
||||
|
||||
- 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
|
||||
vars:
|
||||
glance_api: "{{ glance_services['glance-api'] }}"
|
||||
become: true
|
||||
kolla_toolbox:
|
||||
module_name: mysql_variables
|
||||
@ -23,7 +21,7 @@
|
||||
variable: log_bin_trust_function_creators
|
||||
value: 1
|
||||
run_once: True
|
||||
delegate_to: "{{ groups[glance_api.group][0] }}"
|
||||
delegate_to: "{{ glance_api_hosts[0] }}"
|
||||
when:
|
||||
- not use_preconfigured_databases | bool
|
||||
|
||||
@ -46,7 +44,7 @@
|
||||
restart_policy: "never"
|
||||
volumes: "{{ glance_api.volumes }}"
|
||||
run_once: True
|
||||
delegate_to: "{{ groups[glance_api.group][0] }}"
|
||||
delegate_to: "{{ glance_api_hosts[0] }}"
|
||||
|
||||
- name: Running Glance database migrate container
|
||||
vars:
|
||||
@ -67,13 +65,13 @@
|
||||
restart_policy: "never"
|
||||
volumes: "{{ glance_api.volumes }}"
|
||||
run_once: True
|
||||
delegate_to: "{{ groups[glance_api.group][0] }}"
|
||||
delegate_to: "{{ glance_api_hosts[0] }}"
|
||||
notify:
|
||||
- Restart glance-api container
|
||||
|
||||
# Upgrade remaining node
|
||||
- include_tasks: config.yml
|
||||
when: inventory_hostname != groups["glance-api"][0]
|
||||
when: inventory_hostname != glance_api_hosts[0]
|
||||
|
||||
- name: Flush handlers
|
||||
meta: flush_handlers
|
||||
@ -97,11 +95,9 @@
|
||||
restart_policy: "never"
|
||||
volumes: "{{ glance_api.volumes }}"
|
||||
run_once: True
|
||||
delegate_to: "{{ groups[glance_api.group][0] }}"
|
||||
delegate_to: "{{ glance_api_hosts[0] }}"
|
||||
|
||||
- name: Disable log_bin_trust_function_creators function
|
||||
vars:
|
||||
glance_api: "{{ glance_services['glance-api'] }}"
|
||||
become: true
|
||||
kolla_toolbox:
|
||||
module_name: mysql_variables
|
||||
@ -113,7 +109,7 @@
|
||||
variable: log_bin_trust_function_creators
|
||||
value: 0
|
||||
run_once: True
|
||||
delegate_to: "{{ groups[glance_api.group][0] }}"
|
||||
delegate_to: "{{ glance_api_hosts[0] }}"
|
||||
when:
|
||||
- not use_preconfigured_databases | bool
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user