openstack/charm-neutron-gateway
Code Issues Proposed changes

Small fixes.

Browse Source
This commit is contained in:
Adam Gandelman 2013-05-22 16:00:14 -07:00
parent 9e59178892
commit c933951440
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/hooks.py
View File

@ -31,7 +31,7 @@ def config_changed():
if (available and if (available and
openstack.get_os_version_codename(available) > \ openstack.get_os_version_codename(available) > \
openstack.get_os_version_codename(installed)): openstack.get_os_version_codename(installed)):
qutils.do_openstack_upgrade(src) qutils.do_openstack_upgrade()
if PLUGIN in qutils.GATEWAY_PKGS.keys(): if PLUGIN in qutils.GATEWAY_PKGS.keys():
render_quantum_conf() render_quantum_conf()

2
hooks/quantum_utils.py
View File

@ -239,7 +239,7 @@ def do_openstack_upgrade():
plugin = config_get('plugin') plugin = config_get('plugin')
pkgs = [] pkgs = []
if plugin in GATEWAY_PKGS.keys(): if plugin in GATEWAY_PKGS.keys():
pkgs.append(GATEWAY_PKGS[plugin]) pkgs += GATEWAY_PKGS[plugin]
if plugin == OVS: if plugin == OVS:
pkgs.append('openvswitch-datapath-dkms') pkgs.append('openvswitch-datapath-dkms')
cmd = ['apt-get', '--option', 'Dpkg::Options::=--force-confnew', '-y', cmd = ['apt-get', '--option', 'Dpkg::Options::=--force-confnew', '-y',

2
revision
View File

@ -1 +1 @@
54 56