From 0395513af0cbf402c764773ffa291f1b128c010c Mon Sep 17 00:00:00 2001
From: Lukas Bezdicka <lbezdick@redhat.com>
Date: Tue, 19 May 2020 21:07:14 +0200
Subject: [PATCH] [TRAIN ONLY] post Leapp package fixups

During the UpgradeInit command we set repos and we might be enabling
modules. To ensure proper state we run dnf distro-sync after. This
way we prevent bugs where container-selinux is updated after installing
openstack-selinux package.

We remove ceph-common we should also reinstall it after leep and after
we have repos set up.

Change-Id: Ib33504757a3d4b695f9bac23c9b6fc5e62d17ebf
---
 deployment/ceph-ansible/ceph-base.yaml                 | 10 +++++++++-
 deployment/ceph-ansible/ceph-mds.yaml                  |  2 +-
 deployment/ceph-ansible/ceph-mon.yaml                  |  2 +-
 deployment/ceph-ansible/ceph-osd.yaml                  | 10 ++++++----
 deployment/ceph-ansible/ceph-rgw.yaml                  |  2 +-
 .../tripleo-packages-baremetal-puppet.yaml             |  3 +++
 6 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/deployment/ceph-ansible/ceph-base.yaml b/deployment/ceph-ansible/ceph-base.yaml
index 803ac500ae..cad11ada7a 100644
--- a/deployment/ceph-ansible/ceph-base.yaml
+++ b/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: ''
diff --git a/deployment/ceph-ansible/ceph-mds.yaml b/deployment/ceph-ansible/ceph-mds.yaml
index 278db7e7d1..e83f44055f 100644
--- a/deployment/ceph-ansible/ceph-mds.yaml
+++ b/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: ''
diff --git a/deployment/ceph-ansible/ceph-mon.yaml b/deployment/ceph-ansible/ceph-mon.yaml
index 9b108e9594..2aa9655923 100644
--- a/deployment/ceph-ansible/ceph-mon.yaml
+++ b/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: ''
diff --git a/deployment/ceph-ansible/ceph-osd.yaml b/deployment/ceph-ansible/ceph-osd.yaml
index e49a8dee61..d53b33ed0b 100644
--- a/deployment/ceph-ansible/ceph-osd.yaml
+++ b/deployment/ceph-ansible/ceph-osd.yaml
@@ -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: ''
diff --git a/deployment/ceph-ansible/ceph-rgw.yaml b/deployment/ceph-ansible/ceph-rgw.yaml
index 174e916650..8e867549c6 100644
--- a/deployment/ceph-ansible/ceph-rgw.yaml
+++ b/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: ''
diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
index cd02b358c5..948194a558 100644
--- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
+++ b/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: