openstack/charm-neutron-gateway
Code Issues Proposed changes

Set os release on configs after upgrade to ensure the correct templates are used

Browse Source
This commit is contained in:
Liam Young 2015-10-14 14:44:04 +00:00
parent 54e229e0e1
commit 5be770beef
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hooks/neutron_utils.py
View File

@ -747,6 +747,7 @@ def do_openstack_upgrade(configs):
fatal=True, dist=True) fatal=True, dist=True)
apt_install(get_early_packages(), fatal=True) apt_install(get_early_packages(), fatal=True)
apt_install(get_packages(), fatal=True) apt_install(get_packages(), fatal=True)
configs.set_release(openstack_release=new_os_rel)
configs.write_all() configs.write_all()

2
templates/juno/ml2_conf.ini
View File

@ -1,6 +1,6 @@
############################################################################### ###############################################################################
# [ WARNING ] # [ WARNING ]
# Configuration file maintained by Juju. Local changes may be overwritten. # Configuration file maintained by Juju. Local changes may be overwritten. Juno
############################################################################### ###############################################################################
[ml2] [ml2]
type_drivers = gre,vxlan,vlan,flat type_drivers = gre,vxlan,vlan,flat