py3: Don't purge python-six and fix purge ret val

python-six is also used by crmsh in HA deployment so don't purge it
on OpenStack upgrade or we lose the ability to manage the corosync/
pacemaker cluster.

Also ensure non-empty package list is returned for rocky+ in
determine_purge_packages.

Change-Id: Ia614ec0f9dce907952cab32db2725abe47ef404e
This commit is contained in:
Corey Bryant 2018-10-15 13:18:46 -04:00
parent e94cfbfd7e
commit 471e648830
1 changed files with 2 additions and 1 deletions

View File

@ -88,7 +88,7 @@ CLUSTER_RES = "grp_glance_vips"
PACKAGES = [
"apache2", "glance", "python-mysqldb", "python-swiftclient",
"python-psycopg2", "python-keystone", "python-six", "uuid", "haproxy", ]
"python-psycopg2", "python-keystone", "uuid", "haproxy", ]
PY3_PACKAGES = [
"python3-glance",
@ -280,6 +280,7 @@ def determine_purge_packages():
pkgs.extend(["python-cinderclient",
"python-os-brick",
"python-oslo.rootwrap"])
return pkgs
return []