openstack
/
grenade
Code Issues Proposed changes

Drop Kilo upgrade hack for Neutron 

This patch removes the need for a special upgrade procedure
as outlined in [1]. The Neutron codebases have been tweaked
[2,3,4,5] to allow for a backward compatible upgrade.

[1] https://wiki.openstack.org/wiki/ReleaseNotes/Kilo#Upgrade_Notes_6
[2] https://review.openstack.org/#/c/142484/
[3] https://review.openstack.org/#/c/142482/
[4] https://review.openstack.org/#/c/142474/
[5] https://review.openstack.org/#/c/142150/

Closes-bug: #1401895

Change-Id: I82b8aa4215f9669bb622548f27f8bb53544c9792
This commit is contained in:
armando-migliaccio 2014-12-18 09:36:36 -08:00 committed by Armando Migliaccio
parent f3553a5654
commit ad79234af5
1 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
from-juno/upgrade-neutron
View File

@ -1,30 +0,0 @@
#!/usr/bin/env bash
# ``upgrade-neutron``
KILO_LB_SP="LOADBALANCER:Haproxy:neutron_lbaas.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default"
KILO_VPN_SP="VPN:openswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default"
KILO_FW_DRV="neutron_fwaas.services.firewall.drivers.linux.iptables_fwaas.IptablesFwaasDriver"
KILO_LB_DRV="neutron_lbaas.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver"
KILO_VPN_DRV="neutron_vpnaas.services.vpn.device_drivers.ipsec.OpenSwanDriver"
NEUTRON_FWAAS_CONF_FILE=$NEUTRON_CONF_DIR/fwaas_driver.ini
NEUTRON_LBAAS_CONF_FILE=$NEUTRON_CONF_DIR/services/loadbalancer/haproxy/lbaas_agent.ini
NEUTRON_VPNAAS_CONF_FILE=$NEUTRON_CONF_DIR/vpn_agent.ini
function configure_neutron_upgrade {
XTRACE=$(set +o | grep xtrace)
set -o xtrace
# In Kilo Advanced Services have moved to their own repos, so update their providers and drivers
inicomment $NEUTRON_CONF service_providers service_provider
iniadd $NEUTRON_CONF service_providers service_provider $KILO_LB_SP
iniadd $NEUTRON_CONF service_providers service_provider $KILO_VPN_SP
iniset $NEUTRON_FWAAS_CONF_FILE fwaas driver $KILO_FW_DRV
iniset $NEUTRON_LBAAS_CONF_FILE DEFAULT device_driver $KILO_LB_DRV
iniset $NEUTRON_VPNAAS_CONF_FILE vpnagent vpn_device_driver $KILO_VPN_DRV
$XTRACE
}