commit 89773862006717da2d0338699d88cf884c87e088
Author: yatinkarel <ykarel@redhat.com>
Date:   Wed Sep 30 14:47:46 2020 +0530

    Use ansible_pkg_mgr instead of hardcoded yum
    
    Also fix following:-
    - Fix usage of python-tripleoclient, package
      name is python3-tripleoclient for EL8 distros,
      using python*-tripleoclient will work for both
      EL7 and EL8.
    - Move package update tasks to container-prep
      as that's run before standalone upgrade and package
      needs to be updated before container prep.
    - Add tripleo-ansible to package update list as that's
      need to be latest like other tripleo packages.
    
    Related-Bug: #1897863
    Depends-On: https://review.opendev.org/#/c/755312/
    Change-Id: I20c3814e367a6d062961b7d81615b22a35a8e67b

diff --git a/roles/standalone-upgrade/tasks/main.yml b/roles/standalone-upgrade/tasks/main.yml
index b385594..70409d0 100644
--- a/roles/standalone-upgrade/tasks/main.yml
+++ b/roles/standalone-upgrade/tasks/main.yml
@@ -1,5 +1,9 @@
 ---
 # tasks file for all_in_one upgrade
+- name: gather facts used by role
+  setup:
+    gather_subset: "!min,pkg_mgr"
+  when: ansible_pkg_mgr is not defined
 
 # standalone params
 - name: Create the standalone params for upgrade
diff --git a/roles/standalone-upgrade/templates/standalone-container-prep.sh.j2 b/roles/standalone-upgrade/templates/standalone-container-prep.sh.j2
index 393224a..dd39200 100644
--- a/roles/standalone-upgrade/templates/standalone-container-prep.sh.j2
+++ b/roles/standalone-upgrade/templates/standalone-container-prep.sh.j2
@@ -1,3 +1,9 @@
+# Update tripleo packages before using tripleo commands
+sudo {{ ansible_pkg_mgr }} update -y \
+    python*-tripleoclient \
+    openstack-tripleo-common \
+    tripleo-ansible \
+    openstack-tripleo-heat-templates
 # generate the default container prepare statement
 openstack tripleo container image prepare default \
   --output-env-file {{ working_dir }}/containers-prepare-parameters-upgrade.yaml {{ standalone_container_prep_options }}
diff --git a/roles/standalone-upgrade/templates/standalone.sh.j2 b/roles/standalone-upgrade/templates/standalone.sh.j2
index 17faa18..eb2d3dc 100644
--- a/roles/standalone-upgrade/templates/standalone.sh.j2
+++ b/roles/standalone-upgrade/templates/standalone.sh.j2
@@ -3,11 +3,6 @@ if openstack tripleo upgrade --help | grep -qe "--yes"; then
     PROMPT_ANSWER="--yes"
 fi
 
-sudo yum update -y \
-    python-tripleoclient \
-    openstack-tripleo-common \
-    openstack-tripleo-heat-templates
-
 sudo openstack tripleo upgrade $PROMPT_ANSWER \
   --templates \
   --local-ip={{ standalone_ip }}/{{ standalone_network_prefix }} \