Minor fixes for Ubuntu 20.04, and then Python3 AND Rocky9 support (#277)

Adds python3, ubuntu 20.04 and Rocky 9 support. Adds `--debug` flag.

Signed-off-by: Jeremy J. Miller <[email protected]>

Author: jeremymv2

group_vars/glance.yml

@@ -4,7 +4,4 @@
 glance_filesystem_store_datadir: /var/opt/pf9/imagelibrary/data
 glance_public_endpoint: False
 glance_images:
-  - https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2
-  - https://cloud-images.ubuntu.com/releases/bionic/release/ubuntu-18.04-server-cloudimg-amd64.img
-  #- https://cloud-images.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img
-  - http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img
+  - http://download.cirros-cloud.net/0.5.1/cirros-0.5.1-x86_64-disk.img

inventory/pf9.py

@@ -29,7 +29,7 @@ def __init__(self):
         else:
             self.inventory = self.empty_inventory()
 
-        print json.dumps(self.inventory)
+        print(json.dumps(self.inventory))
 
     def get_du_inventory(self):
         """
@@ -46,7 +46,7 @@ def get_du_inventory(self):
             try:
                 os_token_file = open(self.pf9_keystone_file)
                 os_token = os_token_file.read().strip()
-            except Exception, err:
+            except Exception(err):
                 raise err
         else:
             return self.empty_inventory()
@@ -62,7 +62,7 @@ def get_du_inventory(self):
             response = requests.get(url, headers=headers)
         except requests.exceptions.MissingSchema as err:
             response = requests.get("https://%s" % url, headers=headers)
-        except Exception, err:
+        except Exception(err):
             return self.empty_inventory()
 
         # Return empty inventory if token is not good

pf9-express

@@ -6,7 +6,7 @@
 
 # initialize variables
 basedir=$(dirname $0)
-min_ansible_version="2.2"
+min_ansible_version="2.02"
 oscli_version=pike
 oscli_rc_file=${basedir}/pf9-openstack.rc
 inventory=${basedir}/inventory/hosts
@@ -38,6 +38,7 @@ flag_csvImport=0
 flag_deauth=0
 flag_k8s_upgrade=0
 flag_pmk_only=0
+verbosity=""
 extra_vars=""
 awx_pf9_user="pf9"
 awx_pf9_password="Pl@tform9"
@@ -61,6 +62,7 @@ usage() {
   echo "-l|--log                   : Log output file. Assumes parent directory already exists."
   echo "-u|--upgradeK8s            : upgrade Kubernetes nodes"
   echo "-v|--inventory <file>      : use alternate inventory file for Ansible"
+  echo "-g|--debug                 : use extra ansible verbosity for debugging"
   echo "-f|--csvFile <file>        : import CSV file"
   echo "-t|--tag <tag[,<tag>]>     : available tags = [live-migration, image-import]"
   echo -e "-h|--help                  : display this message\n"
@@ -195,13 +197,19 @@ validate_platform() {
     host_os_info=$(cat /etc/centos-release)
   elif [ -r /etc/lsb-release ]; then
     release=$(cat /etc/lsb-release | grep ^DISTRIB_RELEASE= /etc/lsb-release | cut -d '=' -f2)
-    if [[ ! "${release}" == 16.04* ]] && [[ ! "${release}" == 18.04* ]]; then assert "unsupported Ubuntu release: ${release}"; fi
+    if [[ ! "${release}" == 16.04* ]] && [[ ! "${release}" == 18.04* ]] && [[ ! "${release}" == 20.04* ]] ; then assert "unsupported Ubuntu release: ${release}"; fi
     platform="ubuntu"
     ubuntu_release=$(cat /etc/lsb-release | grep ^DISTRIB_RELEASE | cut -d = -f2)
     host_os_info="${platform} ${ubuntu_release}"
+  elif [ -r /etc/rocky-release ]; then
+    release=$(cat /etc/rocky-release | cut -d ' ' -f 4)
+    if [[ ! "${release}" == 9.* ]]; then assert "unsupported Rocky release: ${release}"; fi
+    platform="rocky"
+    host_os_info=$(cat /etc/rocky-release)
   else
     assert "unsupported platform"
   fi
+  echo "Found release $release on platform $platform"
 }
 
 banner() {
@@ -328,10 +336,20 @@ install_oscli() {
   # source rc file
   source ${oscli_rc_file}
 
-  # install openstack cli packages (CentOS)
+  pip install python-openstackclient> ${log} 2>&1
+  echo "You may need to add /usr/local/bin to your \$PATH"
+  echo "export PATH=\$PATH:/usr/local/bin"
+}
+
+install_prereqs() {
+  echo "--> Installing Prerequisites"
+  # display log
+  echo "--> Installation Log: ${install_log}"
+
+  # install Ansible (and dependencies)
+  echo -n "--> Validating package dependencies: "
   if [ "${platform}" == "centos" ]; then
-    echo -n "--> Installing Package Dependencies: "
-    for pkg in gcc openssl-devel python-pip python-wheel python-virtualenv python-virtualenvwrapper; do
+    for pkg in epel-release ntp nginx gcc python-devel python3-pip jq bc; do
       echo -n "${pkg} "
       rpm -q ${pkg} > /dev/null 2>&1
       if [ $? -ne 0 ]; then
@@ -342,46 +360,50 @@ install_oscli() {
         fi
       fi
     done
-    echo
-
-    echo "--> Configuring Python Virtual Environment"
-    if [ ! -r /usr/bin/virtualenvwrapper.sh ]; then assert "missing script: /usr/bin/virtualenvwrapper.sh"; fi
-    source /usr/bin/virtualenvwrapper.sh
-    export WORKON_HOME=$HOME/.virtenvs
-    mkvirtualenv os_cli > ${log} 2>&1
-
-    echo "--> Upgrading PIP"
-    pip install pip==20.3.4 --upgrade > ${log} 2>&1
-
-    echo "--> Installing OpenStack CLI"
-    pip install --upgrade --requirement \
-        https://raw.githubusercontent.com/platform9/support-locker/master/openstack-clients/requirements.txt \
-        --constraint http://raw.githubusercontent.com/openstack/requirements/stable/${oscli_version}/upper-constraints.txt > ${log} 2>&1
 
-    # tracking alternate method of installation
-    # echo "--> Installing OpenStack CLI"
-    # pip install python-openstackclient> ${log} 2>&1
-  fi
-
-  # install openstack cli packages (Ubuntu)
-  if [ "${platform}" == "ubuntu" ]; then
-    assert "Not Implemented (for platform = ${platform})"
-  fi
+    ## upgrade pip
+    sudo pip install --upgrade pip > ${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; 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_prereqs() {
-  # display log
-  echo "--> Installation Log: ${install_log}"
+    ## install additional pip-based packages
+    for pkg in 'openstacksdk==0.62.0' docker-py pyopenssl; do
+      echo -n "${pkg} "
+      sudo pip install ${pkg} --upgrade > ${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 Ansible (and dependencies)
-  echo -n "--> Validating package dependencies: "
-  if [ "${platform}" == "centos" ]; then
-    for pkg in epel-release ntp nginx gcc python-devel python2-pip jq bc; do
+    ## install additional yum-based packages
+    for pkg in ansible; do
       echo -n "${pkg} "
-      rpm -q ${pkg} > /dev/null 2>&1
+      sudo yum -y install ${pkg} > ${log} 2>&1
       if [ $? -ne 0 ]; then
-        sudo yum -y install ${pkg} > ${log} 2>&1
+        echo -e "\nERROR: failed to install ${pkg} - here's the last 10 lines of the log:\n"
+        tail -10 ${log}; exit 1
+      fi
+    done
+    echo
+  elif [ "${platform}" == "rocky" ]; then
+    for pkg in epel-release chrony nginx gcc python3-devel python3-pip jq bc; do
+      echo -n "${pkg} "
+      dnf list installed | grep "^${pkg}\." > /dev/null 2>&1
+      if [ $? -ne 0 ]; then
+        sudo dnf -y install ${pkg} > ${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
@@ -390,14 +412,14 @@ install_prereqs() {
     done
 
     ## upgrade pip
-    sudo pip install --upgrade pip==20.3.4 > ${log} 2>&1
+    sudo pip install --upgrade pip > ${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
+    for pkg in pbr; do
       echo -n "${pkg} "
       sudo pip install ${pkg} --ignore-installed > ${log} 2>&1
       if [ $? -ne 0 ]; then
@@ -407,19 +429,19 @@ install_prereqs() {
     done
 
     ## install additional pip-based packages
-    for pkg in 'openstacksdk==0.39.0' docker-py; do
+    for pkg in 'openstacksdk==0.62.0' docker-py pyopenssl; do
       echo -n "${pkg} "
-      sudo pip install ${pkg} --ignore-installed > ${log} 2>&1
+      sudo pip install ${pkg} --upgrade > ${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 yum-based packages
+    ## install additional dnf-based packages
     for pkg in ansible; do
       echo -n "${pkg} "
-      sudo yum -y install ${pkg} > ${log} 2>&1
+      sudo dnf -y install ${pkg} > ${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
@@ -439,7 +461,7 @@ install_prereqs() {
       fi
     fi
 
-    for pkg in ansible jq bc python-pip; do
+    for pkg in ansible jq bc python3-pip; do
       echo -n "${pkg} "
       dpkg-query -f '${binary:Package}\n' -W | grep ^${pkg}$ > /dev/null 2>&1
       if [ $? -ne 0 ]; then
@@ -459,9 +481,9 @@ install_prereqs() {
     fi
 
     ## install additional pip-based packages
-    for pkg in 'openstacksdk==0.39.0' docker-py; do
+    for pkg in 'openstacksdk==0.62.0' docker-py pyopenssl; do
       echo -n "${pkg} "
-      sudo pip install ${pkg} --ignore-installed > ${log} 2>&1
+      sudo pip install ${pkg} --upgrade > ${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
@@ -513,6 +535,9 @@ while [ $# -gt 0 ]; do
   -d|--deauth)
     flag_deauth=1
     ;;
+  -g|--debug)
+    verbosity="-vvv"
+    ;;
   -l|--log)
     if [ $# -lt 2 ]; then usage; fi
     install_log=${2}
@@ -667,7 +692,7 @@ if [ ${flag_oscli} -eq 1 ]; then
 fi
 
 ## validate minimum Ansible version
-ansible_version=$(ansible --version | head -1 | cut -d ' ' -f2 | cut -d . -f1-2)
+ansible_version=$(ansible --version| head -1| grep core|awk -F ']' '{print $1}'|awk '{print $3}'|cut -d . -f1-2)
 echo "--> ansible_version = ${ansible_version}"
 if (( ! $(bc <<< "$ansible_version >= $min_ansible_version") )); then assert "Ansible ${min_ansible_version} or greater is required"; fi
 
@@ -722,7 +747,7 @@ else
 fi
 
 ## call pf9-express
-sudo ansible-playbook -i ${inventory} -l ${target} ${role_tags} -e "skip_prereq=${flag_skip_prereqs} autoreg=${autoreg} du_fqdn=${ctrl_hostname} ctrl_ip=${ctrl_ip} du_username=${du_username} du_password=${du_password} ${extra_vars}" ${express_script} 2>&1 | tee ${install_log}
+sudo ansible-playbook -i ${inventory} -l ${target} ${role_tags} -e "skip_prereq=${flag_skip_prereqs} autoreg=${autoreg} du_fqdn=${ctrl_hostname} ctrl_ip=${ctrl_ip} du_username=${du_username} du_password=${du_password} ${extra_vars}" ${express_script} ${verbosity} 2>&1 | tee ${install_log}
 
 ## display log path
 echo -e "Installation Log: ${install_log}\n"

pf9-express.yml

@@ -57,8 +57,10 @@
   gather_facts: False
   pre_tasks:
     - debug: var=autoreg
-    - name: install python2 on Ubuntu to enable running Ansible on Ubuntu hosts
-      raw: if [ -e /etc/lsb-release -a ! -e /usr/bin/python ]; then (apt-get -y update && apt-get install -y python-minimal); fi
+    - name: install python3 on Ubuntu hosts
+      raw: if [ -e /etc/lsb-release -a ! -e /usr/bin/python3 ]; then (apt-get -y update && apt-get install -y python3); fi
+    - name: install python3 on Rocky hosts
+      raw: if [ -e /etc/rocky-release -a ! -e /bin/python3 ]; then (dnf -y update && dnf install -y python3); fi
 
 # Run pre_flight_checks
 - hosts:

roles/bond-config/tasks/main.yml

@@ -5,7 +5,7 @@
 ## Configure the physical and sub-interfaces behind the bond
 ##########################################################################################################
 - include: redhat.yml
-  when: ansible_os_family == "RedHat"
+  when: '"RedHat" in ansible_distribution or ansible_distribution == "CentOS" or ansible_distribution == "Rocky"'
 
 - include: ubuntu.yml
   when: ansible_distribution == "Ubuntu"

roles/common/tasks/main.yml

@@ -88,7 +88,10 @@
   when: pf9_account_status is defined and pf9_account_status.stdout.strip() == "not-exist"
 
 - include: redhat.yml
-  when: ansible_os_family == "RedHat"
+  when: '"RedHat" in ansible_distribution or ansible_distribution == "CentOS"'
+
+- include: rocky.yml
+  when: ansible_distribution == "Rocky"
 
 - include: ubuntu.yml
   when: ansible_distribution == "Ubuntu"

roles/common/tasks/rocky.yml

@@ -0,0 +1,25 @@
+---
+- name: Install libselinux-python
+  dnf:
+    state: present
+    name: python3-libselinux
+
+- name: Install the latest version ca-certificates
+  dnf:
+    name: ca-certificates
+    state: latest
+
+- name: Modify devpts mount point
+  mount:
+    state: present
+    name: /dev/pts
+    src: devpts
+    fstype: devpts
+    opts: gid=5,mode=620
+    dump: 0
+    passno: 0
+  register: devpts_result
+
+- name: Remount devpts mount point
+  command: mount -o remount devpts
+  when: devpts_result is changed

roles/customize-ceilometer/tasks/main.yml

@@ -13,6 +13,13 @@
     - ansible_os_family == "RedHat"
     - ansible_pkg_mgr == "yum"
 
+- name: Check if pf9-ceilometer is installed (Rocky)
+  shell: "`which dnf` list installed | grep \"^pf9-ceilometer\\.\" > /dev/null 2>&1; if [ $? -ne 0 ]; then echo 'not-installed'; fi"
+  register: pkg_state_ceilometer_redhat
+  when:
+    - ansible_distribution == "Rocky"
+    - ansible_pkg_mgr == "dnf"
+
 - name: Configure Ceilometer pipeline.yaml
   template:
     src: pipeline.yaml.j2

roles/enable-ksm/tasks/main.yml

@@ -11,7 +11,7 @@
       name: ksmtuned
       state: restarted
       enabled: yes
-  when: ansible_os_family == "RedHat"
+  when: '"RedHat" in ansible_distribution or ansible_distribution == "CentOS" or ansible_distribution == "Rocky"'
 
 - block:
   - name: Install Kernel Same-Page Merging (Ubuntu)

roles/enable-nested-virt/tasks/main.yml

@@ -13,6 +13,13 @@
     - ansible_os_family == "RedHat"
     - ansible_pkg_mgr == "yum"
 
+- name: Check if pf9-ostackhost is installed (Rocky)
+  shell: "`which dnf` list installed | grep \"^pf9-ostackhost\\.\" > /dev/null 2>&1; if [ $? -ne 0 ]; then echo 'not-installed'; fi"
+  register: pkg_state_ostackhost_redhat
+  when:
+    - ansible_distributiong == "Rocky"
+    - ansible_pkg_mgr == "dnf"
+
 - name: update Nova to support nested virtualization
   script: files/update-nova.sh
   when: (pkg_state_ostackhost_ubuntu.stdout is defined and pkg_state_ostackhost_ubuntu.stdout.strip() != "not-installed") or