From 471e64883020a8611540c22741124e365028c2ec Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey.bryant@canonical.com>
Date: Mon, 15 Oct 2018 13:18:46 -0400
Subject: [PATCH] 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
---
 hooks/glance_utils.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hooks/glance_utils.py b/hooks/glance_utils.py
index ccdec8f5..e035bdfa 100644
--- a/hooks/glance_utils.py
+++ b/hooks/glance_utils.py
@@ -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 []