From 50b78681f2f26d6bdf04ffeeae7c6c6dbeb05b92 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 20 Sep 2021 17:24:47 -0400 Subject: [PATCH 1/4] Ubuntu 20.04 Support --- salt/common/init.sls | 7 +++++++ salt/mysql/init.sls | 6 +++++- salt/salt/init.sls | 4 ++++ salt/salt/scripts/bootstrap-salt.sh | 4 ++++ salt/ssl/init.sls | 4 ++++ setup/so-functions | 9 ++++++--- 6 files changed, 30 insertions(+), 4 deletions(-) diff --git a/salt/common/init.sls b/salt/common/init.sls index 0fa7794af..18c70747a 100644 --- a/salt/common/init.sls +++ b/salt/common/init.sls @@ -107,10 +107,17 @@ commonpkgs: heldpackages: pkg.installed: - pkgs: + {% if grains['codename'] == 'bionic' %} - containerd.io: 1.4.4-1 - docker-ce: 5:20.10.5~3-0~ubuntu-bionic - docker-ce-cli: 5:20.10.5~3-0~ubuntu-bionic - docker-ce-rootless-extras: 5:20.10.5~3-0~ubuntu-bionic + {% elif grains['codename'] == 'focal' %} + - containerd.io: 1.4.9-1 + - docker-ce: 5:20.10.8~3-0~ubuntu-focal + - docker-ce-cli: 5:20.10.5~3-0~ubuntu-focal + - docker-ce-rootless-extras: 5:20.10.5~3-0~ubuntu-focal + {% endif %} - hold: True - update_holds: True diff --git a/salt/mysql/init.sls b/salt/mysql/init.sls index be44b652c..04cbacc99 100644 --- a/salt/mysql/init.sls +++ b/salt/mysql/init.sls @@ -22,7 +22,11 @@ mysqlpkgs: - skip_suggestions: False - pkgs: {% if grains['os'] != 'CentOS' %} - - python-mysqldb + {% if grains['codename'] == 'bionic' %} + - python3-mysqldb + {% elif grains['codename'] == 'focal' %} + - python3-mysqldb + {% endif %} {% else %} - MySQL-python {% endif %} diff --git a/salt/salt/init.sls b/salt/salt/init.sls index 18be055db..d01fe1958 100644 --- a/salt/salt/init.sls +++ b/salt/salt/init.sls @@ -3,7 +3,11 @@ saltpymodules: pkg.installed: - pkgs: - python-docker + {% if grains['codename'] == 'bionic' %} - python-m2crypto + {% elif grains['codename'] == 'focal' %} + - python3-m2crypto + {% endif %} {% endif %} salt_bootstrap: diff --git a/salt/salt/scripts/bootstrap-salt.sh b/salt/salt/scripts/bootstrap-salt.sh index 70241a041..3e54afce0 100644 --- a/salt/salt/scripts/bootstrap-salt.sh +++ b/salt/salt/scripts/bootstrap-salt.sh @@ -3082,7 +3082,11 @@ install_ubuntu_git_deps() { __PACKAGES="${__PACKAGES} python3-setuptools" else # There is no m2crypto package for Py3 at this time - only install for Py2 + if [ $DISTRO_CODENAME == "focal" ]; then + __PACKAGES="${__PACKAGES} python3-m2crypto" + else __PACKAGES="${__PACKAGES} python-m2crypto" + fi fi __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-crypto python${PY_PKG_VER}-jinja2" diff --git a/salt/ssl/init.sls b/salt/ssl/init.sls index f6cfaf4f4..54c48ab34 100644 --- a/salt/ssl/init.sls +++ b/salt/ssl/init.sls @@ -42,7 +42,11 @@ m2cryptopkgs: pkg.installed: - skip_suggestions: False - pkgs: + {% if grains['codename'] == 'bionic' %} - python-m2crypto + {% elif grains['codename'] == 'focal' %} + - python3-m2crypto + {% endif %} {% endif %} removefbcertdir: diff --git a/setup/so-functions b/setup/so-functions index 06ec7238a..f2cdbc237 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1104,8 +1104,8 @@ detect_os() { OS=ubuntu if grep -q "UBUNTU_CODENAME=bionic" /etc/os-release; then OSVER=bionic - elif grep -q "UBUNTU_CODENAME=xenial" /etc/os-release; then - OSVER=xenial + elif grep -q "UBUNTU_CODENAME=focal" /etc/os-release; then + OSVER=focal else echo "We do not support your current version of Ubuntu." exit 1 @@ -2159,9 +2159,12 @@ saltify() { else DEBIAN_FRONTEND=noninteractive retry 50 10 "apt-get -y -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\" upgrade" >> "$setup_log" 2>&1 || exit 1 - if [ $OSVER != "xenial" ]; then + if [ $OSVER == "bionic" ]; then # Switch to Python 3 as default if this is not xenial update-alternatives --install /usr/bin/python python /usr/bin/python3.6 10 >> "$setup_log" 2>&1 + elif [ $OSVER == "focal" ]; then + # Switch to Python 3 as default if this is not xenial + update-alternatives --install /usr/bin/python python /usr/bin/python3.8 10 >> "$setup_log" 2>&1 fi local pkg_arr=( From 481ffb1cda760556f743092184c523a18b8eae46 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 20 Sep 2021 18:12:18 -0400 Subject: [PATCH 2/4] Fix Grain --- salt/common/init.sls | 4 ++-- salt/mysql/init.sls | 4 ++-- salt/salt/init.sls | 4 ++-- salt/ssl/init.sls | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/salt/common/init.sls b/salt/common/init.sls index 18c70747a..f993534b3 100644 --- a/salt/common/init.sls +++ b/salt/common/init.sls @@ -107,12 +107,12 @@ commonpkgs: heldpackages: pkg.installed: - pkgs: - {% if grains['codename'] == 'bionic' %} + {% if grains['oscodename'] == 'bionic' %} - containerd.io: 1.4.4-1 - docker-ce: 5:20.10.5~3-0~ubuntu-bionic - docker-ce-cli: 5:20.10.5~3-0~ubuntu-bionic - docker-ce-rootless-extras: 5:20.10.5~3-0~ubuntu-bionic - {% elif grains['codename'] == 'focal' %} + {% elif grains['oscodename'] == 'focal' %} - containerd.io: 1.4.9-1 - docker-ce: 5:20.10.8~3-0~ubuntu-focal - docker-ce-cli: 5:20.10.5~3-0~ubuntu-focal diff --git a/salt/mysql/init.sls b/salt/mysql/init.sls index 04cbacc99..46e62fcc0 100644 --- a/salt/mysql/init.sls +++ b/salt/mysql/init.sls @@ -22,9 +22,9 @@ mysqlpkgs: - skip_suggestions: False - pkgs: {% if grains['os'] != 'CentOS' %} - {% if grains['codename'] == 'bionic' %} + {% if grains['oscodename'] == 'bionic' %} - python3-mysqldb - {% elif grains['codename'] == 'focal' %} + {% elif grains['oscodename'] == 'focal' %} - python3-mysqldb {% endif %} {% else %} diff --git a/salt/salt/init.sls b/salt/salt/init.sls index d01fe1958..504ddbcd5 100644 --- a/salt/salt/init.sls +++ b/salt/salt/init.sls @@ -3,9 +3,9 @@ saltpymodules: pkg.installed: - pkgs: - python-docker - {% if grains['codename'] == 'bionic' %} + {% if grains['oscodename'] == 'bionic' %} - python-m2crypto - {% elif grains['codename'] == 'focal' %} + {% elif grains['oscodename'] == 'focal' %} - python3-m2crypto {% endif %} {% endif %} diff --git a/salt/ssl/init.sls b/salt/ssl/init.sls index 54c48ab34..5690691fc 100644 --- a/salt/ssl/init.sls +++ b/salt/ssl/init.sls @@ -42,9 +42,9 @@ m2cryptopkgs: pkg.installed: - skip_suggestions: False - pkgs: - {% if grains['codename'] == 'bionic' %} + {% if grains['oscodename'] == 'bionic' %} - python-m2crypto - {% elif grains['codename'] == 'focal' %} + {% elif grains['oscodename'] == 'focal' %} - python3-m2crypto {% endif %} {% endif %} From 5f475ff9cb4d604f9186745adec20035dec55ef7 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 20 Sep 2021 18:46:43 -0400 Subject: [PATCH 3/4] Fix Python Problem --- salt/salt/init.sls | 2 ++ 1 file changed, 2 insertions(+) diff --git a/salt/salt/init.sls b/salt/salt/init.sls index 504ddbcd5..aa27b7fdd 100644 --- a/salt/salt/init.sls +++ b/salt/salt/init.sls @@ -5,8 +5,10 @@ saltpymodules: - python-docker {% if grains['oscodename'] == 'bionic' %} - python-m2crypto + - python-docker {% elif grains['oscodename'] == 'focal' %} - python3-m2crypto + - python3-docker {% endif %} {% endif %} From c1537335b1a63c79fc015f593aa11934a6b5763a Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 20 Sep 2021 19:05:01 -0400 Subject: [PATCH 4/4] Fix Python Problem --- salt/salt/init.sls | 1 - 1 file changed, 1 deletion(-) diff --git a/salt/salt/init.sls b/salt/salt/init.sls index aa27b7fdd..fe340772e 100644 --- a/salt/salt/init.sls +++ b/salt/salt/init.sls @@ -2,7 +2,6 @@ saltpymodules: pkg.installed: - pkgs: - - python-docker {% if grains['oscodename'] == 'bionic' %} - python-m2crypto - python-docker