Browse Source

Merge "Stop ironic services in unupgraded controllers" into stable/victoria

changes/38/777538/1
Zuul 5 months ago
committed by Gerrit Code Review
parent
commit
478c5c694b
  1. 14
      deployment/ironic/ironic-api-container-puppet.yaml
  2. 15
      deployment/ironic/ironic-conductor-container-puppet.yaml
  3. 16
      deployment/ironic/ironic-inspector-container-puppet.yaml
  4. 16
      deployment/ironic/ironic-pxe-container-puppet.yaml
  5. 15
      deployment/nova/nova-ironic-container-puppet.yaml

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

@ -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

@ -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

@ -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

@ -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

@ -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([]) }}"
Loading…
Cancel
Save