From 0a45bcea70f87380f7e514e4d17ba897bdec5eb0 Mon Sep 17 00:00:00 2001
From: Paavan Shanbhag <pshanbhag@platform9.com>
Date: Wed, 19 Jan 2022 07:17:50 -0800
Subject: [PATCH 1/5] Lock down express to work for py2 environments

---
 pf9-express | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pf9-express b/pf9-express
index 1036023..ed49f66 100755
--- a/pf9-express
+++ b/pf9-express
@@ -351,7 +351,7 @@ install_oscli() {
     mkvirtualenv os_cli > ${log} 2>&1
 
     echo "--> Upgrading PIP"
-    pip install pip --upgrade > ${log} 2>&1
+    pip install pip==20.3.4 --upgrade > ${log} 2>&1
 
     echo "--> Installing OpenStack CLI"
     pip install --upgrade --requirement \
@@ -390,12 +390,22 @@ install_prereqs() {
     done
 
     ## upgrade pip
-    sudo pip install --upgrade pip > ${log} 2>&1
+    sudo pip install --upgrade pip==20.3.4 > ${log} 2>&1
     if [ $? -ne 0 ]; then
       echo -e "\nERROR: failed to upgrade pip - here's the last 10 lines of the log:\n"
       tail -10 ${log}; exit 1
     fi
 
+    # Install pbr
+    for pkg in 'pbr==5.6.0'; do
+      echo -n "${pkg} "
+      sudo pip install ${pkg} --ignore-installed > ${log} 2>&1
+      if [ $? -ne 0 ]; then
+        echo -e "\nERROR: failed to install ${pkg} - here's the last 10 lines of the log:\n"
+        tail -10 ${log}; exit 1
+      fi
+    done
+
     ## install additional pip-based packages
     for pkg in 'openstacksdk==0.39.0' docker-py; do
       echo -n "${pkg} "

From 9f253a707fd0aa1d4174929ee23a3c0f5eab2a00 Mon Sep 17 00:00:00 2001
From: mjkota <42035996+mjkota@users.noreply.github.com>
Date: Thu, 20 Jan 2022 15:18:20 +0530
Subject: [PATCH 2/5] Update main.yml

---
 roles/qemu-kvm-ev/tasks/main.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/roles/qemu-kvm-ev/tasks/main.yml b/roles/qemu-kvm-ev/tasks/main.yml
index f4d1a07..28c333b 100644
--- a/roles/qemu-kvm-ev/tasks/main.yml
+++ b/roles/qemu-kvm-ev/tasks/main.yml
@@ -5,6 +5,11 @@
     copy:
       dest: /etc/yum/vars/contentdir
       content: 'centos'
+ 
+ - name: install the epel-release repo
+    yum:
+      name: epel-release
+      state: latest
 
   - name: install the centos-release-qemu-ev repo
     yum:

From 201c2e05b64448cf08e1989b8de628212fd761ad Mon Sep 17 00:00:00 2001
From: mjkota <42035996+mjkota@users.noreply.github.com>
Date: Thu, 20 Jan 2022 15:19:51 +0530
Subject: [PATCH 3/5] Install ca-certificates package

---
 roles/glance-host/tasks/main.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/roles/glance-host/tasks/main.yml b/roles/glance-host/tasks/main.yml
index efaef2a..8b89276 100644
--- a/roles/glance-host/tasks/main.yml
+++ b/roles/glance-host/tasks/main.yml
@@ -1,4 +1,11 @@
 ---
+# CentOS
+- block:
+  - name: install the latest version ca-certificates
+    yum:
+      name: ca-certificates
+      state: latest
+  when: ansible_distribution == "CentOS"
 
 - name: Create Glance image library path
   file:

From 470b0a0a13062100988469b1aaafdcef3b6f64fd Mon Sep 17 00:00:00 2001
From: mjkota <42035996+mjkota@users.noreply.github.com>
Date: Thu, 20 Jan 2022 15:23:43 +0530
Subject: [PATCH 4/5] Update pf9 repo

---
 roles/neutron-prerequisites/tasks/redhat.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/neutron-prerequisites/tasks/redhat.yml b/roles/neutron-prerequisites/tasks/redhat.yml
index 2f0ad42..d6c7f74 100644
--- a/roles/neutron-prerequisites/tasks/redhat.yml
+++ b/roles/neutron-prerequisites/tasks/redhat.yml
@@ -52,7 +52,7 @@
 
 - name: Add Platform9 Yum repository
   yum:
-    name: https://s3-us-west-1.amazonaws.com/platform9-neutron/noarch/platform9-neutron-repo.noarch.rpm
+    name: https://s3-us-west-1.amazonaws.com/platform9-neutron/noarch/platform9-neutron-repo-1-0.noarch.rpm
     state: present
     update_cache: yes
 

From dda0e4b17f443922c90fed770c6ead36485b7de0 Mon Sep 17 00:00:00 2001
From: mjkota <42035996+mjkota@users.noreply.github.com>
Date: Fri, 21 Jan 2022 19:44:57 +0530
Subject: [PATCH 5/5] Indention issue fixed

---
 roles/qemu-kvm-ev/tasks/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/qemu-kvm-ev/tasks/main.yml b/roles/qemu-kvm-ev/tasks/main.yml
index 28c333b..29740ce 100644
--- a/roles/qemu-kvm-ev/tasks/main.yml
+++ b/roles/qemu-kvm-ev/tasks/main.yml
@@ -6,7 +6,7 @@
       dest: /etc/yum/vars/contentdir
       content: 'centos'
  
- - name: install the epel-release repo
+  - name: install the epel-release repo
     yum:
       name: epel-release
       state: latest