openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Stop ironic services in unupgraded controllers 

This change makes ironic services on unupgrade controller nodes get
stopped, because all services in the unupgraded controllers should be
stopped before we start the upgraded controller[1].

[1] 8529ce60da

Change-Id: Iedddb02c4a27195d0f89bc4b9dfb12ffba054ae5
(cherry picked from commit 099badda3c)
This commit is contained in:
Takashi Kajinami 2020-09-05 18:13:27 +09:00
parent 8201121d70
commit e3b75f1dbf
5 changed files with 76 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
deployment/ironic/ironic-api-container-puppet.yaml
View File

@ -300,6 +300,20 @@ outputs:
tags:
- online_upgrade
- online_upgrade_ironic
- when:
- step|int == 1
tags:
- never
- system_upgrade_transfer_data
- system_upgrade_stop_services
block:
- name: Stop ironic api container
import_role:
name: tripleo_container_stop
vars:
tripleo_containers_to_stop:
- ironic_api
tripleo_delegate_to: "{{ groups['ironic_api'] | default([]) }}"
external_update_tasks:
- when: step|int == 1
block: *ironic_online_db_migration

15
deployment/ironic/ironic-conductor-container-puppet.yaml
View File

@ -646,3 +646,18 @@ outputs:
- step|int == 0
tags: common
block: *ironic_config_data_cleanup
external_upgrade_tasks:
- when:
- step|int == 1
tags:
- never
- system_upgrade_transfer_data
- system_upgrade_stop_services
block:
- name: Stop ironic conductor container
import_role:
name: tripleo_container_stop
vars:
tripleo_containers_to_stop:
- ironic_conductor
tripleo_delegate_to: "{{ groups['ironic_conductor'] | default([]) }}"

16
deployment/ironic/ironic-inspector-container-puppet.yaml
View File

@ -528,3 +528,19 @@ outputs:
- step|int == 0
tags: common
block: *ironic_config_data_cleanup
external_upgrade_tasks:
- when:
- step|int == 1
tags:
- never
- system_upgrade_transfer_data
- system_upgrade_stop_services
block:
- name: Stop ironic inspector container
import_role:
name: tripleo_container_stop
vars:
tripleo_containers_to_stop:
- ironic_inspector
- ironic_inspector_dnsmasq
tripleo_delegate_to: "{{ groups['ironic_inspector'] | default([]) }}"

16
deployment/ironic/ironic-pxe-container-puppet.yaml
View File

@ -177,3 +177,19 @@ outputs:
- { 'path': /var/lib/ironic, 'setype': container_file_t, 'mode': 'g+s' }
- { 'path': /var/log/containers/ironic, 'setype': container_file_t, 'mode': '0750' }
- { 'path': /var/log/containers/httpd/ironic-pxe, 'setype': container_file_t, 'mode': '0750' }
external_upgrade_tasks:
- when:
- step|int == 1
tags:
- never
- system_upgrade_transfer_data
- system_upgrade_stop_services
block:
- name: Stop ironic pxe container
import_role:
name: tripleo_container_stop
vars:
tripleo_containers_to_stop:
- ironic_pxe_tftp
- ironic_pxe_http
tripleo_delegate_to: "{{ groups['ironic_pxe'] | default([]) }}"

15
deployment/nova/nova-ironic-container-puppet.yaml
View File

@ -227,3 +227,18 @@ outputs:
persistent: yes
state: yes
external_post_deploy_tasks: {get_attr: [NovaComputeCommon, nova_compute_common_deploy_steps_tasks]}
external_upgrade_tasks:
- when:
- step|int == 1
tags:
- never
- system_upgrade_transfer_data
- system_upgrade_stop_services
block:
- name: Stop nova ironic container
import_role:
name: tripleo_container_stop
vars:
tripleo_containers_to_stop:
- nova_compute
tripleo_delegate_to: "{{ groups['nova_ironic'] | default([]) }}"