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

deployment/ceph-ansible/ceph-base.yaml

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

deployment/ceph-ansible/ceph-mds.yaml

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

deployment/ceph-ansible/ceph-mon.yaml

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

deployment/ceph-ansible/ceph-osd.yaml

@@ -70,10 +70,12 @@ outputs:
     value:
       service_name: ceph_osd
       upgrade_tasks:
-        - name: Check legacy Ceph hieradata
+        list_concat:
-          tags: validation
+        - {get_attr: [CephBase, role_data, upgrade_tasks]}
-          when: step|int == 0
+        - - name: Check legacy Ceph hieradata
-          shell: test "nil" == "$(hiera -c /etc/puppet/hiera.yaml ceph::profile::params::osds)"
+            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: ''

deployment/ceph-ansible/ceph-rgw.yaml

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

deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml

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