From d7dfc265d302d77ebdb71bc7c7e255f84a789523 Mon Sep 17 00:00:00 2001
From: Ryan Beisner <ryan.beisner@canonical.com>
Date: Wed, 17 Dec 2014 17:34:33 +0000
Subject: [PATCH] cleanup

---
 hooks/quantum_hooks.py | 2 +-
 hooks/quantum_utils.py | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/hooks/quantum_hooks.py b/hooks/quantum_hooks.py
index ba495204..b10c5ab6 100755
--- a/hooks/quantum_hooks.py
+++ b/hooks/quantum_hooks.py
@@ -61,7 +61,7 @@ def install():
         src = 'cloud:precise-folsom'
     configure_installation_source(src)
     apt_update(fatal=True)
-    apt_install('python-six', fatal=True)
+    apt_install('python-six', fatal=True)  # Force upgrade
     if valid_plugin():
         apt_install(filter_installed_packages(get_early_packages()),
                     fatal=True)
diff --git a/hooks/quantum_utils.py b/hooks/quantum_utils.py
index 1b3042bf..55a12807 100644
--- a/hooks/quantum_utils.py
+++ b/hooks/quantum_utils.py
@@ -91,7 +91,6 @@ QUANTUM_GATEWAY_PKGS = {
         "quantum-dhcp-agent",
         'python-mysqldb',
         'python-psycopg2',
-#        "python-six",  # Force upgrade
         "nova-api-metadata"
     ],
     NVP: [
@@ -99,7 +98,6 @@ QUANTUM_GATEWAY_PKGS = {
         "quantum-dhcp-agent",
         'python-mysqldb',
         'python-psycopg2',
-#        "python-six",  # Force upgrade
         "nova-api-metadata"
     ]
 }
@@ -113,7 +111,6 @@ NEUTRON_GATEWAY_PKGS = {
         'python-mysqldb',
         'python-psycopg2',
         'python-oslo.config',  # Force upgrade
-#        "python-six",  # Force upgrade
         "nova-api-metadata",
         "neutron-plugin-metering-agent",
         "neutron-lbaas-agent",
@@ -123,7 +120,6 @@ NEUTRON_GATEWAY_PKGS = {
         'python-mysqldb',
         'python-psycopg2',
         'python-oslo.config',  # Force upgrade
-#        "python-six",  # Force upgrade
         "nova-api-metadata"
     ],
     N1KV: [
@@ -131,7 +127,6 @@ NEUTRON_GATEWAY_PKGS = {
         "neutron-dhcp-agent",
         "python-mysqldb",
         "python-psycopg2",
-#        "python-six",  # Force upgrade
         "nova-api-metadata",
         "neutron-common",
         "neutron-l3-agent"
@@ -157,12 +152,10 @@ def get_early_packages():
         pkgs = determine_dkms_package()
     else:
         return []
-#        return ['python-six']
 
     # ensure headers are installed build any required dkms packages
     if [p for p in pkgs if 'dkms' in p]:
         return pkgs + [headers_package()]
-#    pkgs.append('python-six')
     return pkgs