Browse Source

Merge "[FFWD Ceph] Fix ceph post_upgrade_tasks for osd options" into stable/ussuri

changes/06/748306/1
Zuul 4 weeks ago
committed by Gerrit Code Review
parent
commit
eee6e6b5f8
5 changed files with 54 additions and 8 deletions
  1. +1
    -0
      deployment/ceph-ansible/ceph-base.yaml
  2. +2
    -1
      deployment/ceph-ansible/ceph-mds.yaml
  3. +2
    -1
      deployment/ceph-ansible/ceph-mon.yaml
  4. +47
    -5
      deployment/ceph-ansible/ceph-osd.yaml
  5. +2
    -1
      deployment/ceph-ansible/ceph-rgw.yaml

+ 1
- 0
deployment/ceph-ansible/ceph-base.yaml View File

@@ -560,6 +560,7 @@ outputs:
value:
service_name: ceph_base
upgrade_tasks: []
post_upgrade_tasks: []
puppet_config:
config_image: ''
config_volume: ''


+ 2
- 1
deployment/ceph-ansible/ceph-mds.yaml View File

@@ -70,7 +70,8 @@ outputs:
- dashboard_enabled
- - '9100'
- []
upgrade_tasks: []
upgrade_tasks: {get_attr: [CephBase, role_data, upgrade_tasks]}
post_upgrade_tasks: {get_attr: [CephBase, role_data, post_upgrade_tasks]}
puppet_config:
config_image: ''
config_volume: ''


+ 2
- 1
deployment/ceph-ansible/ceph-mon.yaml View File

@@ -79,12 +79,13 @@ outputs:
- dashboard_enabled
- - '9100'
- []
upgrade_tasks: []
service_config_settings:
collectd:
tripleo.collectd.plugins.ceph_osd:
- ceph
collectd::plugin::ceph::daemons: []
upgrade_tasks: {get_attr: [CephBase, role_data, upgrade_tasks]}
post_upgrade_tasks: {get_attr: [CephBase, role_data, post_upgrade_tasks]}
puppet_config:
config_image: ''
config_volume: ''


+ 47
- 5
deployment/ceph-ansible/ceph-osd.yaml View File

@@ -78,16 +78,58 @@ outputs:
- dashboard_enabled
- - '9100'
- []
upgrade_tasks:
- name: Check legacy Ceph hieradata
tags: validation
when: step|int == 0
shell: test "nil" == "$(hiera -c /etc/puppet/hiera.yaml ceph::profile::params::osds)"
service_config_settings:
collectd:
tripleo.collectd.plugins.ceph_osd:
- ceph
collectd::plugin::ceph::daemons: []
upgrade_tasks:
list_concat:
- {get_attr: [CephBase, role_data, upgrade_tasks]}
- - block:
- name: Check for docker cli
stat:
path: "/var/run/docker.sock"
register: check_docker_cli
check_mode: false
- name: Set noout flag
shell: "{{ container_client }} exec -u root ceph-mon-${HOSTNAME} ceph osd set {{ item }}"
become: true
with_items:
- noout
- norecover
- nobackfill
- norebalance
- nodeep-scrub
vars:
container_client: |-
{% set container_client = 'podman' %}
{% if check_docker_cli.stat.exists|bool %}
{% set container_client = 'docker' %}
{% endif %}
{{ container_client }}
delegate_to: "{{ ceph_mon_short_bootstrap_node_name }}"
tags:
- never
- system_upgrade
- system_upgrade_prepare
when:
- step|int == 1
- upgrade_leapp_enabled
post_upgrade_tasks:
list_concat:
- {get_attr: [CephBase, role_data, post_upgrade_tasks]}
- - name: Unset noout flag
shell: "{{ container_cli }} exec -u root ceph-mon-${HOSTNAME} ceph osd unset {{ item }}"
with_items:
- noout
- norecover
- nobackfill
- norebalance
- nodeep-scrub
when: step|int == 2
become: true
delegate_to: "{{ ceph_mon_short_bootstrap_node_name }}"
puppet_config:
config_image: ''
config_volume: ''


+ 2
- 1
deployment/ceph-ansible/ceph-rgw.yaml View File

@@ -129,7 +129,8 @@ outputs:
- member
- ResellerAdmin
- swiftoperator
upgrade_tasks: []
upgrade_tasks: {get_attr: [CephBase, role_data, upgrade_tasks]}
post_upgrade_tasks: {get_attr: [CephBase, role_data, post_upgrade_tasks]}
puppet_config:
config_image: ''
config_volume: ''


Loading…
Cancel
Save