[FFWD Ceph] Fix ceph post_upgrade_tasks for osd options
Add missing post_upgrade_tasks shared from the ceph-base. Move post_upgrade_tasks that set noout options of ceph to only the ceph osd service as they are targeted for this service. Move the set nooout options out of system_upgrade tags so they run only after full upgrade run with deployment so the podman is already present on the nodes. Resolves: rhbz#1870617 Change-Id: I738d5c8cdd57b02589c147f5891cf8cb0e395d3a
This commit is contained in:
parent
ec63059884
commit
a9be4c6a38
|
@ -560,6 +560,7 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: ceph_base
|
service_name: ceph_base
|
||||||
upgrade_tasks: []
|
upgrade_tasks: []
|
||||||
|
post_upgrade_tasks: []
|
||||||
puppet_config:
|
puppet_config:
|
||||||
config_image: ''
|
config_image: ''
|
||||||
config_volume: ''
|
config_volume: ''
|
||||||
|
|
|
@ -70,7 +70,8 @@ outputs:
|
||||||
- dashboard_enabled
|
- dashboard_enabled
|
||||||
- - '9100'
|
- - '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:
|
puppet_config:
|
||||||
config_image: ''
|
config_image: ''
|
||||||
config_volume: ''
|
config_volume: ''
|
||||||
|
|
|
@ -79,12 +79,13 @@ outputs:
|
||||||
- dashboard_enabled
|
- dashboard_enabled
|
||||||
- - '9100'
|
- - '9100'
|
||||||
- []
|
- []
|
||||||
upgrade_tasks: []
|
|
||||||
service_config_settings:
|
service_config_settings:
|
||||||
collectd:
|
collectd:
|
||||||
tripleo.collectd.plugins.ceph_osd:
|
tripleo.collectd.plugins.ceph_osd:
|
||||||
- ceph
|
- ceph
|
||||||
collectd::plugin::ceph::daemons: []
|
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:
|
puppet_config:
|
||||||
config_image: ''
|
config_image: ''
|
||||||
config_volume: ''
|
config_volume: ''
|
||||||
|
|
|
@ -78,16 +78,58 @@ outputs:
|
||||||
- dashboard_enabled
|
- dashboard_enabled
|
||||||
- - '9100'
|
- - '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:
|
service_config_settings:
|
||||||
collectd:
|
collectd:
|
||||||
tripleo.collectd.plugins.ceph_osd:
|
tripleo.collectd.plugins.ceph_osd:
|
||||||
- ceph
|
- ceph
|
||||||
collectd::plugin::ceph::daemons: []
|
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:
|
puppet_config:
|
||||||
config_image: ''
|
config_image: ''
|
||||||
config_volume: ''
|
config_volume: ''
|
||||||
|
|
|
@ -129,7 +129,8 @@ outputs:
|
||||||
- member
|
- member
|
||||||
- ResellerAdmin
|
- ResellerAdmin
|
||||||
- swiftoperator
|
- 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:
|
puppet_config:
|
||||||
config_image: ''
|
config_image: ''
|
||||||
config_volume: ''
|
config_volume: ''
|
||||||
|
|
Loading…
Reference in New Issue