Browse Source

Merge "[Train only] Add missing stop service steps for FFU." into stable/train

changes/30/752230/6
Zuul 10 months ago
committed by Gerrit Code Review
parent
commit
bc38fe40b0
  1. 15
      deployment/swift/swift-proxy-container-puppet.yaml
  2. 15
      deployment/swift/swift-ringbuilder-container-puppet.yaml
  3. 15
      deployment/swift/swift-storage-container-puppet.yaml

15
deployment/swift/swift-proxy-container-puppet.yaml

@ -479,3 +479,18 @@ outputs:
when: swift_log_link.stat.islnk is defined and swift_log_link.stat.islnk
metadata_settings:
get_attr: [TLSProxyBase, role_data, metadata_settings]
external_upgrade_tasks:
- when:
- step|int == 1
tags:
- never
- system_upgrade_transfer_data
- system_upgrade_stop_services
block:
- name: Stop swift-proxy container
import_role:
name: tripleo-container-stop
vars:
tripleo_containers_to_stop:
- swift-proxy
tripleo_delegate_to: "{{ groups['swift_proxy'] | default([]) }}"

15
deployment/swift/swift-ringbuilder-container-puppet.yaml

@ -124,3 +124,18 @@ outputs:
volumes:
- /var/lib/config-data/puppet-generated/swift/etc/swift:/etc/swift:rw,z
- /var/lib/config-data/swift_ringbuilder:/swift_ringbuilder:ro
external_upgrade_tasks:
- when:
- step|int == 1
tags:
- never
- system_upgrade_transfer_data
- system_upgrade_stop_services
block:
- name: Stop swift-ringbuilder container
import_role:
name: tripleo-container-stop
vars:
tripleo_containers_to_stop:
- swift-ringbuilder
tripleo_delegate_to: "{{ groups['swift_ringbuilder'] | default([]) }}"

15
deployment/swift/swift-storage-container-puppet.yaml

@ -686,3 +686,18 @@ outputs:
path: /var/log/containers/swift
state: absent
when: swift_log_link.stat.islnk is defined and swift_log_link.stat.islnk
external_upgrade_tasks:
- when:
- step|int == 1
tags:
- never
- system_upgrade_transfer_data
- system_upgrade_stop_services
block:
- name: Stop swift-storage container
import_role:
name: tripleo-container-stop
vars:
tripleo_containers_to_stop:
- swift-storage
tripleo_delegate_to: "{{ groups['swift_storage'] | default([]) }}"
Loading…
Cancel
Save