Browse Source

Merge "[TRAIN ONLY] post Leapp package fixups" into stable/train

changes/84/735184/5
Zuul 3 months ago
committed by Gerrit Code Review
parent
commit
76ff521ed7
6 changed files with 21 additions and 8 deletions
  1. +9
    -1
      deployment/ceph-ansible/ceph-base.yaml
  2. +1
    -1
      deployment/ceph-ansible/ceph-mds.yaml
  3. +1
    -1
      deployment/ceph-ansible/ceph-mon.yaml
  4. +6
    -4
      deployment/ceph-ansible/ceph-osd.yaml
  5. +1
    -1
      deployment/ceph-ansible/ceph-rgw.yaml
  6. +3
    -0
      deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml

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

@@ -575,7 +575,15 @@ outputs:
description: Role data for the Ceph base service.
value:
service_name: ceph_base
upgrade_tasks: []
upgrade_tasks:
- name: Reinstall ceph-common package which was removed in tripleo-packages-baremetal-puppet.yaml workaround
package:
name:
- ceph-common
state: present
when:
- step|int == 1
- ansible_distribution_major_version == '8'
puppet_config:
config_image: ''
config_volume: ''


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

@@ -61,7 +61,7 @@ outputs:
description: Role data for the Ceph Metadata service.
value:
service_name: ceph_mds
upgrade_tasks: []
upgrade_tasks: {get_attr: [CephBase, role_data, upgrade_tasks]}
puppet_config:
config_image: ''
config_volume: ''


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

@@ -69,7 +69,7 @@ outputs:
description: Role data for the Ceph Monitor service.
value:
service_name: ceph_mon
upgrade_tasks: []
upgrade_tasks: {get_attr: [CephBase, role_data, upgrade_tasks]}
puppet_config:
config_image: ''
config_volume: ''


+ 6
- 4
deployment/ceph-ansible/ceph-osd.yaml View File

@@ -70,10 +70,12 @@ outputs:
value:
service_name: ceph_osd
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)"
list_concat:
- {get_attr: [CephBase, role_data, 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)"
puppet_config:
config_image: ''
config_volume: ''


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

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


+ 3
- 0
deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml View File

@@ -267,6 +267,9 @@ outputs:
- ''
- - "#!/bin/bash\n\n"
- {get_param: UpgradeInitCommonCommand}
- name: Ensure EL modules are in proper state
shell: dnf -y distro-sync
when: ansible_distribution_major_version == '8'
- name: Ensure TripleO prerequisite packages are installed
package:
name:


Loading…
Cancel
Save