diff --git a/pf9-express b/pf9-express index 10360231..ed49f667 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} " diff --git a/roles/glance-host/tasks/main.yml b/roles/glance-host/tasks/main.yml index efaef2a9..8b892768 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: diff --git a/roles/neutron-prerequisites/tasks/redhat.yml b/roles/neutron-prerequisites/tasks/redhat.yml index 2f0ad42f..d6c7f74a 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 diff --git a/roles/qemu-kvm-ev/tasks/main.yml b/roles/qemu-kvm-ev/tasks/main.yml index f4d1a07b..29740ce2 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: