From c93395144041a82b5b29cf314d19c87c82950fb1 Mon Sep 17 00:00:00 2001 From: Adam Gandelman Date: Wed, 22 May 2013 16:00:14 -0700 Subject: [PATCH] Small fixes. --- hooks/hooks.py | 2 +- hooks/quantum_utils.py | 2 +- revision | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hooks/hooks.py b/hooks/hooks.py index 42da039d..d706766f 100755 --- a/hooks/hooks.py +++ b/hooks/hooks.py @@ -31,7 +31,7 @@ def config_changed(): if (available and openstack.get_os_version_codename(available) > \ openstack.get_os_version_codename(installed)): - qutils.do_openstack_upgrade(src) + qutils.do_openstack_upgrade() if PLUGIN in qutils.GATEWAY_PKGS.keys(): render_quantum_conf() diff --git a/hooks/quantum_utils.py b/hooks/quantum_utils.py index 4f29b751..6cd76bf4 100644 --- a/hooks/quantum_utils.py +++ b/hooks/quantum_utils.py @@ -239,7 +239,7 @@ def do_openstack_upgrade(): plugin = config_get('plugin') pkgs = [] if plugin in GATEWAY_PKGS.keys(): - pkgs.append(GATEWAY_PKGS[plugin]) + pkgs += GATEWAY_PKGS[plugin] if plugin == OVS: pkgs.append('openvswitch-datapath-dkms') cmd = ['apt-get', '--option', 'Dpkg::Options::=--force-confnew', '-y', diff --git a/revision b/revision index fb1e7bc8..f6b91e0e 100644 --- a/revision +++ b/revision @@ -1 +1 @@ -54 +56