Commit 90a741fd authored by David Johnson's avatar David Johnson

Add some Newton support.

parent 7d1ba519
--- /usr/share/openstack-dashboard/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.spec.js~ 2016-10-06 07:13:37.000000000 -0600
+++ /usr/share/openstack-dashboard/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.spec.js 2016-11-14 10:06:00.087144478 -0700
@@ -836,8 +836,8 @@
model.newInstanceSpec.security_groups = [ { id: 'adminId', name: 'admin' },
{ id: 'demoId', name: 'demo' } ];
model.newInstanceSpec.scheduler_hints = {};
- model.newInstanceSpec.vol_create = true;
- model.newInstanceSpec.vol_delete_on_instance_delete = true;
+ model.newInstanceSpec.vol_create = false;
+ model.newInstanceSpec.vol_delete_on_instance_delete = false;
model.newInstanceSpec.vol_device_name = "volTestName";
model.newInstanceSpec.vol_size = 10;
model.newInstanceSpec.server_groups = [];
--- /usr/share/openstack-dashboard/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/source/source.controller.js~ 2016-10-06 07:13:37.000000000 -0600
+++ /usr/share/openstack-dashboard/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/source/source.controller.js 2016-11-14 10:01:27.503142035 -0700
@@ -401,7 +401,7 @@
function updateBootSourceSelection(selectedSource) {
ctrl.currentBootSource = selectedSource;
- if ((selectedSource === bootSourceTypes.IMAGE) && $scope.model.volumeBootable) {
+ if (false && (selectedSource === bootSourceTypes.IMAGE) && $scope.model.volumeBootable) {
$scope.model.newInstanceSpec.vol_create = true;
} else {
$scope.model.newInstanceSpec.vol_create = false;
--- /usr/lib/python2.7/dist-packages/manila_ui/dashboards/project/shares/__init__.py~ 2016-03-04 07:37:15.000000000 -0700
+++ /usr/lib/python2.7/dist-packages/manila_ui/dashboards/project/shares/__init__.py 2016-11-13 16:28:53.309247791 -0700
@@ -84,7 +84,7 @@
def _get_manila_disabled_quotas(request):
disabled_quotas = []
if not base.is_service_enabled(request, 'share'):
- disabled_quotas.extend(MANILA_QUOTA_FIELDS)
+ disabled_quotas.update(MANILA_QUOTA_FIELDS)
return disabled_quotas
@@ -126,7 +126,7 @@
@wrap(quotas.get_disabled_quotas)
def get_disabled_quotas(f, request):
disabled_quotas = f(request)
- disabled_quotas.extend(_get_manila_disabled_quotas(request))
+ disabled_quotas.update(_get_manila_disabled_quotas(request))
return disabled_quotas
--- /usr/lib/python2.7/dist-packages/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/br_cookie.py~ 2016-08-29 12:09:29.000000000 -0600
+++ /usr/lib/python2.7/dist-packages/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/br_cookie.py 2016-10-27 16:29:22.185857224 -0600
@@ -15,6 +15,8 @@
from neutron.agent.common import ovs_lib
+import os
+import os.path
class OVSBridgeCookieMixin(object):
'''Mixin to provide cookie retention functionality
@@ -24,7 +26,19 @@
def __init__(self, *args, **kwargs):
super(OVSBridgeCookieMixin, self).__init__(*args, **kwargs)
self._reserved_cookies = set()
-
+ if not os.path.exists("/var/lib/neutron/ovs-default-flows.reserved_cookie"):
+ sc = self.request_cookie()
+ self._reserved_cookies.add(sc)
+ f = file("/var/lib/neutron/ovs-default-flows.reserved_cookie",'w')
+ f.write(str(sc))
+ f.close()
+ else:
+ f = file("/var/lib/neutron/ovs-default-flows.reserved_cookie",'r')
+ sc = int(f.read())
+ f.close()
+ self._reserved_cookies.add(sc)
+ pass
+
@property
def reserved_cookies(self):
if self._default_cookie not in self._reserved_cookies:
......@@ -27,8 +27,8 @@ pc = portal.Context()
# Define *many* parameters; see the help docs in geni-lib to learn how to modify.
#
pc.defineParameter("release","OpenStack Release",
portal.ParameterType.STRING,"mitaka",[("mitaka","Mitaka"),("liberty","Liberty"),("kilo","Kilo (deprecated)"),("juno","Juno (deprecated)")],
longDescription="We provide OpenStack Mitaka (Ubuntu 16.04); Liberty (Ubuntu 15.10); Kilo (Ubuntu 15.04); or Juno (Ubuntu 14.10). OpenStack is installed from packages available on these distributions.")
portal.ParameterType.STRING,"newton",[("newton","Newton"),("mitaka","Mitaka"),("liberty","Liberty"),("kilo","Kilo (deprecated)"),("juno","Juno (deprecated)")],
longDescription="We provide OpenStack Newton, Mitaka (Ubuntu 16.04); Liberty (Ubuntu 15.10); Kilo (Ubuntu 15.04); or Juno (Ubuntu 14.10). OpenStack is installed from packages available on these distributions.")
pc.defineParameter("computeNodeCount", "Number of compute nodes (at Site 1)",
portal.ParameterType.INTEGER, 1)
pc.defineParameter("osNodeType", "Hardware Type",
......@@ -836,6 +836,9 @@ class Parameters(RSpec.Resource):
param = ET.SubElement(el,paramXML)
param.text = "EXTRAIMAGEURLS='%s'" % (str(params.extraImageURLs))
param = ET.SubElement(el,paramXML)
param.text = "OSRELEASE='%s'" % (str(params.release))
return el
pass
......
......@@ -66,7 +66,11 @@ fi
crudini --set /etc/nova/nova.conf DEFAULT rpc_backend rabbit
crudini --set /etc/nova/nova.conf DEFAULT auth_strategy keystone
crudini --set /etc/nova/nova.conf DEFAULT my_ip ${MGMTIP}
crudini --set /etc/nova/nova.conf glance host $CONTROLLER
if [ $OSVERSION -lt $OSNEWTON ]; then
crudini --set /etc/nova/nova.conf glance host $CONTROLLER
else
crudini --set /etc/nova/nova.conf glance api_servers http://$CONTROLLER:9292
fi
crudini --set /etc/nova/nova.conf DEFAULT verbose ${VERBOSE_LOGGING}
crudini --set /etc/nova/nova.conf DEFAULT debug ${DEBUG_LOGGING}
......@@ -109,6 +113,11 @@ else
username nova
crudini --set /etc/nova/nova.conf keystone_authtoken \
password "${NOVA_PASS}"
if [ $OSVERSION -ge $OSMITAKA ]; then
crudini --set /etc/nova/nova.conf keystone_authtoken \
memcached_servers ${CONTROLLER}:11211
fi
fi
if [ $OSVERSION -ge $OSKILO ]; then
......@@ -138,8 +147,18 @@ fi
cname=`getfqdn $CONTROLLER`
crudini --set /etc/nova/nova.conf $VNCSECTION vncserver_listen ${MGMTIP}
crudini --set /etc/nova/nova.conf $VNCSECTION vncserver_proxyclient_address ${MGMTIP}
crudini --set /etc/nova/nova.conf $VNCSECTION \
novncproxy_base_url "http://${cname}:6080/vnc_auto.html"
#
# https://bugs.launchpad.net/nova/+bug/1635131
#
if [ $OSVERSION -eq $OSNEWTON ]; then
chost=`host $cname | sed -E -n -e 's/^(.* has address )(.*)$/\\2/p'`
crudini --set /etc/nova/nova.conf $VNCSECTION \
novncproxy_base_url "http://${chost}:6080/vnc_auto.html"
else
crudini --set /etc/nova/nova.conf $VNCSECTION \
novncproxy_base_url "http://${cname}:6080/vnc_auto.html"
fi
#
# Change vnc_enabled = True for x86 -- but for aarch64, there is
# no video device, for KVM mode, anyway, it seems.
......
......@@ -345,7 +345,7 @@ if [ -z "${KEYSTONE_DBPASS}" ]; then
crudini --set /etc/keystone/keystone.conf token driver \
'keystone.token.persistence.backends.sql.Token'
fi
elif [ $OSVERSION -ge $OSLIBERTY ]; then
elif [ $OSVERSION -le $OSMITAKA ]; then
crudini --set /etc/keystone/keystone.conf token provider 'uuid'
crudini --set /etc/keystone/keystone.conf revoke driver 'sql'
if [ $KEYSTONEUSEMEMCACHE -eq 1 ]; then
......@@ -362,10 +362,9 @@ if [ -z "${KEYSTONE_DBPASS}" ]; then
crudini --set /etc/keystone/keystone.conf token driver 'memcache'
crudini --set /etc/keystone/keystone.conf memcache servers \
'localhost:11211'
else
crudini --set /etc/keystone/keystone.conf token driver 'sql'
fi
keystone-manage fernet_setup --keystone-user keystone \
--keystone-group keystone
fi
crudini --set /etc/keystone/keystone.conf DEFAULT verbose ${VERBOSE_LOGGING}
......@@ -373,6 +372,13 @@ if [ -z "${KEYSTONE_DBPASS}" ]; then
su -s /bin/sh -c "/usr/bin/keystone-manage db_sync" keystone
if [ $OSVERSION -ge $OSNEWTON ]; then
keystone-manage fernet_setup --keystone-user keystone \
--keystone-group keystone
keystone-manage credential_setup --keystone-user keystone \
--keystone-group keystone
fi
if [ $OSVERSION -eq $OSKILO -a $KEYSTONEUSEWSGI -eq 1 ]; then
cat <<EOF >/etc/apache2/sites-available/wsgi-keystone.conf
Listen 5000
......@@ -419,7 +425,8 @@ EOF
cp -p /var/www/cgi-bin/keystone/admin /var/www/cgi-bin/keystone/main
chown -R keystone:keystone /var/www/cgi-bin/keystone
chmod 755 /var/www/cgi-bin/keystone/*
elif [ $OSVERSION -ge $OSLIBERTY -a $KEYSTONEUSEWSGI -eq 1 ]; then
elif [ $OSVERSION -ge $OSLIBERTY -a $KEYSTONEUSEWSGI -eq 1 \
-a $OSVERSION -lt $OSNEWTON ]; then
cat <<EOF >/etc/apache2/sites-available/wsgi-keystone.conf
Listen 5000
Listen 35357
......@@ -659,6 +666,10 @@ if [ "x$KEYSTONEAPIVERSION" = "x3" ]; then
else
echo "export OS_IDENTITY_API_VERSION=2.0" >> $OURDIR/admin-openrc-newcli.sh
fi
if [ $OSVERSION -ge $OSNEWTON ]; then
echo "export OS_IMAGE_API_VERSION=2" >> $OURDIR/admin-openrc-newcli.sh
fi
if [ "x$KEYSTONEAPIVERSION" = "x3" ]; then
if [ $OSVERSION -lt $OSMITAKA ]; then
echo "OS_PROJECT_DOMAIN_ID=\"default\"" > $OURDIR/admin-openrc-newcli.py
......@@ -678,6 +689,9 @@ if [ "x$KEYSTONEAPIVERSION" = "x3" ]; then
else
echo "OS_IDENTITY_API_VERSION=2.0" >> $OURDIR/admin-openrc-newcli.py
fi
if [ $OSVERSION -ge $OSNEWTON ]; then
echo "OS_IMAGE_API_VERSION=2" >> $OURDIR/admin-openrc-newcli.py
fi
#
# From here on out, we need to be the adminapi user.
......@@ -814,6 +828,9 @@ if [ -z "${GLANCE_DBPASS}" ]; then
crudini --set /etc/glance/glance-api.conf glance_store \
filesystem_store_datadir /var/lib/glance/images/
crudini --set /etc/glance/glance-api.conf DEFAULT notification_driver noop
if [ $OSVERSION -ge $OSNEWTON ]; then
crudini --set /etc/glance/glance-api.conf glance_store stores file,http
fi
fi
crudini --set /etc/glance/glance-registry.conf database \
......@@ -920,17 +937,17 @@ if [ -z "${NOVA_DBPASS}" ]; then
if [ $KEYSTONEAPIVERSION -lt 3 ]; then
__openstack endpoint create \
--publicurl http://$CONTROLLER:8774/v2/%\(tenant_id\)s \
--internalurl http://$CONTROLLER:8774/v2/%\(tenant_id\)s \
--adminurl http://$CONTROLLER:8774/v2/%\(tenant_id\)s \
--publicurl http://$CONTROLLER:8774/${NAPISTR}/%\(tenant_id\)s \
--internalurl http://$CONTROLLER:8774/${NAPISTR}/%\(tenant_id\)s \
--adminurl http://$CONTROLLER:8774/${NAPISTR}/%\(tenant_id\)s \
--region $REGION compute
else
__openstack endpoint create --region $REGION \
compute public http://${CONTROLLER}:8774/v2/%\(tenant_id\)s
compute public http://${CONTROLLER}:8774/${NAPISTR}/%\(tenant_id\)s
__openstack endpoint create --region $REGION \
compute internal http://${CONTROLLER}:8774/v2/%\(tenant_id\)s
compute internal http://${CONTROLLER}:8774/${NAPISTR}/%\(tenant_id\)s
__openstack endpoint create --region $REGION \
compute admin http://${CONTROLLER}:8774/v2/%\(tenant_id\)s
compute admin http://${CONTROLLER}:8774/${NAPISTR}/%\(tenant_id\)s
fi
fi
......@@ -1094,6 +1111,30 @@ EOF
rm -f /var/lib/nova/nova.sqlite
#
# Ensure that the default flavors exist. They seem not to on Newton...
#
/usr/bin/openstack flavor show m1.tiny 2>&1 >/dev/null
if [ ! $? -eq 0 ]; then
__openstack flavor create m1.tiny --id 1 --ram 512 --disk 1 --vcpus 1 --public
fi
/usr/bin/openstack flavor show m1.small 2>&1 >/dev/null
if [ ! $? -eq 0 ]; then
__openstack flavor create m1.small --id 2 --ram 2048 --disk 20 --vcpus 1 --public
fi
/usr/bin/openstack flavor show m1.medium 2>&1 >/dev/null
if [ ! $? -eq 0 ]; then
__openstack flavor create m1.medium --id 3 --ram 4096 --disk 40 --vcpus 2 --public
fi
/usr/bin/openstack flavor show m1.large 2>&1 >/dev/null
if [ ! $? -eq 0 ]; then
__openstack flavor create m1.large --id 4 --ram 8192 --disk 80 --vcpus 4 --public
fi
/usr/bin/openstack flavor show m1.xlarge 2>&1 >/dev/null
if [ ! $? -eq 0 ]; then
__openstack flavor create m1.xlarge --id 5 --ram 16384 --disk 160 --vcpus 8 --public
fi
echo "NOVA_DBPASS=\"${NOVA_DBPASS}\"" >> $SETTINGS
echo "NOVA_PASS=\"${NOVA_PASS}\"" >> $SETTINGS
logtend "nova"
......@@ -1263,7 +1304,7 @@ if [ -z "${NEUTRON_DBPASS}" ]; then
crudini --set /etc/neutron/neutron.conf DEFAULT \
notify_nova_on_port_data_changes True
crudini --set /etc/neutron/neutron.conf DEFAULT \
nova_url http://$CONTROLLER:8774/v2
nova_url http://$CONTROLLER:8774/${NAPISTR}
if [ $OSVERSION -eq $OSJUNO ]; then
service_tenant_id=`keystone tenant-get service | grep id | cut -d '|' -f 3`
......@@ -1612,6 +1653,18 @@ EOF
fi
fi
#
# On some versions, we have special patches to customize horizon.
# For instance, on Newton, we don't want volume creation to be the
# default.
#
if [ $OSVERSION -eq $OSNEWTON ]; then
patch -p0 -d / < $DIRNAME/etc/horizon-${OSCODENAME}-no-default-volcreate.patch
# Rebuild after patching javascripts.
/usr/share/openstack-dashboard/manage.py collectstatic \
&& /usr/share/openstack-dashboard/manage.py compress
fi
service_restart apache2
service_enable apache2
service_restart memcached
......@@ -1971,6 +2024,13 @@ EOF
fi
fi
#
# Ugh, more Manila bugs
#
if [ $OSVERSION -eq $OSNEWTON -a -f $DIRNAME/etc/manila-${OSCODENAME}-noset.patch ]; then
patch -p0 -d / < $DIRNAME/etc/manila-${OSCODENAME}-noset.patch
fi
service_restart apache2
service_restart memcached
......@@ -2465,7 +2525,7 @@ if [ -z "${CEILOMETER_DBPASS}" ]; then
MDONE=1
while [ $MDONE -ne 0 ]; do
sleep 1
mongo --host ${CONTROLLER} --eval "db = db.getSiblingDB(\"ceilometer\"); db.addUser({user: \"ceilometer\", pwd: \"${CEILOMETER_DBPASS}\", roles: [ \"readWrite\", \"dbAdmin\" ]})"
mongo --host ${MGMTIP} --eval "db = db.getSiblingDB(\"ceilometer\"); db.addUser({user: \"ceilometer\", pwd: \"${CEILOMETER_DBPASS}\", roles: [ \"readWrite\", \"dbAdmin\" ]})"
MDONE=$?
done
else
......@@ -2521,7 +2581,7 @@ if [ -z "${CEILOMETER_DBPASS}" ]; then
if [ "${CEILOMETER_USE_MONGODB}" = "1" ]; then
crudini --set /etc/ceilometer/ceilometer.conf database \
connection "mongodb://ceilometer:${CEILOMETER_DBPASS}@$CONTROLLER:27017/ceilometer"
connection "mongodb://ceilometer:${CEILOMETER_DBPASS}@${MGMTIP}:27017/ceilometer"
else
crudini --set /etc/ceilometer/ceilometer.conf database \
connection "mysql://ceilometer:${CEILOMETER_DBPASS}@$CONTROLLER/ceilometer?charset=utf8"
......@@ -2996,7 +3056,7 @@ if [ -z "${TROVE_DBPASS}" ]; then
crudini --set /etc/trove/trove.conf DEFAULT \
trove_auth_url http://${CONTROLLER}:5000/${KAPISTR}
crudini --set /etc/trove/trove.conf DEFAULT \
nova_compute_url http://${CONTROLLER}:8774/v2
nova_compute_url http://${CONTROLLER}:8774/${NAPISTR}
crudini --set /etc/trove/trove.conf DEFAULT \
cinder_url http://${CONTROLLER}:8776/v1
crudini --set /etc/trove/trove.conf DEFAULT \
......@@ -3036,7 +3096,7 @@ if [ -z "${TROVE_DBPASS}" ]; then
crudini --set /etc/trove/trove-taskmanager.conf DEFAULT \
trove_auth_url http://${CONTROLLER}:5000/${KAPISTR}
crudini --set /etc/trove/trove-taskmanager.conf DEFAULT \
nova_compute_url http://${CONTROLLER}:8774/v2
nova_compute_url http://${CONTROLLER}:8774/${NAPISTR}
crudini --set /etc/trove/trove-taskmanager.conf DEFAULT \
cinder_url http://${CONTROLLER}:8776/v1
crudini --set /etc/trove/trove-taskmanager.conf DEFAULT \
......@@ -3076,7 +3136,7 @@ if [ -z "${TROVE_DBPASS}" ]; then
crudini --set /etc/trove/trove-conductor.conf DEFAULT \
trove_auth_url http://${CONTROLLER}:5000/${KAPISTR}
crudini --set /etc/trove/trove-conductor.conf DEFAULT \
nova_compute_url http://${CONTROLLER}:8774/v2
nova_compute_url http://${CONTROLLER}:8774/${NAPISTR}
crudini --set /etc/trove/trove-conductor.conf DEFAULT \
cinder_url http://${CONTROLLER}:8776/v1
crudini --set /etc/trove/trove-conductor.conf DEFAULT \
......
......@@ -86,7 +86,7 @@ DO_APT_UPDATE=1
UBUNTUMIRRORHOST=""
UBUNTUMIRRORPATH=""
ENABLE_NEW_SERIAL_SUPPORT=0
DO_UBUNTU_CLOUDARCHIVE=1
DO_UBUNTU_CLOUDARCHIVE=0
BUILD_AARCH64_FROM_CORE=0
DISABLE_SECURITY_GROUPS=0
DEFAULT_SECGROUP_ENABLE_SSH_ICMP=1
......@@ -110,6 +110,8 @@ ML2PLUGIN="openvswitch"
MANILADRIVER="generic"
EXTRAIMAGEURLS=""
LINUXBRIDGE_STATIC=0
# The input OpenStack release, if any, from profile params.
OSRELEASE=""
#
# We have an 'adminapi' user that gets a random password. Then, we have
......@@ -296,24 +298,45 @@ OSJUNO=10
OSKILO=11
OSLIBERTY=12
OSMITAKA=13
OSNEWTON=14
. /etc/lsb-release
if [ ${DISTRIB_CODENAME} = "wily" ]; then
#
# Allow a specific release to trump the image defaults, maybe.
#
if [ ! "x$OSRELEASE" = "x" ]; then
OSCODENAME="$OSRELEASE"
if [ $OSCODENAME = "juno" ]; then OSVERSION=$OSJUNO ; fi
if [ $OSCODENAME = "kilo" ]; then OSVERSION=$OSKILO ; fi
if [ $OSCODENAME = "liberty" ]; then OSVERSION=$OSLIBERTY ; fi
if [ $OSCODENAME = "mitaka" ]; then OSVERSION=$OSMITAKA ; fi
if [ $OSCODENAME = "newton" ]; then OSVERSION=$OSNEWTON ; fi
#
# We only use cloudarchive for LTS images!
#
echo "$DISTRIB_DESCRIPTION" | grep -qi LTS
if [ $? -eq 0 ]; then
DO_UBUNTU_CLOUDARCHIVE=1
fi
elif [ ${DISTRIB_CODENAME} = "wily" ]; then
OSCODENAME="liberty"
OSVERSION=$OSLIBERTY
REGION="RegionOne"
elif [ ${DISTRIB_CODENAME} = "vivid" ]; then
OSCODENAME="kilo"
OSVERSION=$OSKILO
REGION="RegionOne"
elif [ ${DISTRIB_CODENAME} = "xenial" ]; then
OSCODENAME="mitaka"
OSVERSION=$OSMITAKA
REGION="RegionOne"
else
OSCODENAME="juno"
OSVERSION=$OSJUNO
fi
if [ $OSVERSION -eq $OSJUNO ]; then
REGION="regionOne"
else
REGION="RegionOne"
fi
#
......@@ -334,6 +357,14 @@ else
KAPISTR='v2.0'
fi
#
# Figure out Nova API string.
#
NAPISTR="v2"
if [ $OSVERSION -ge $OSNEWTON ]; then
NAPISTR="v2.1"
fi
#
# Figure out if we got told to use keystone wsgi or not, or what our
# default should be if not.
......@@ -637,14 +668,18 @@ maybe_install_packages() {
fi
}
if [ ! -f /etc/apt/sources.list.d/cloudarchive-${OSCODENAME}.list \
-a ! -f $OURDIR/cloudarchive-added \
-a "${DO_UBUNTU_CLOUDARCHIVE}" = "1" ]; then
if [ "${DISTRIB_CODENAME}" = "trusty" ] ; then
$APTGETINSTALL install -y ubuntu-cloud-keyring
echo "deb http://ubuntu-cloud.archive.canonical.com/ubuntu" "${DISTRIB_CODENAME}-updates/${OSCODENAME} main" > /etc/apt/sources.list.d/cloudarchive-${OSCODENAME}.list
if [ ! -f $OURDIR/cloudarchive-added -a "${DO_UBUNTU_CLOUDARCHIVE}" = "1" ]; then
#if [ "${DISTRIB_CODENAME}" = "trusty" ] ; then
# $APTGETINSTALL install -y ubuntu-cloud-keyring
# echo "deb http://ubuntu-cloud.archive.canonical.com/ubuntu" "${DISTRIB_CODENAME}-updates/${OSCODENAME} main" > /etc/apt/sources.list.d/cloudarchive-${OSCODENAME}.list
# apt-get update
#elif [ "${DISTRIB_CODENAME}" = "xenial" ] ; then
maybe_install_packages software-properties-common
# Disable unattended upgrades!
rm -fv /etc/apt/apt.conf.d/*unattended-upgrades
add-apt-repository -y cloud-archive:$OSRELEASE
apt-get update
fi
#fi
touch $OURDIR/cloudarchive-added
fi
......
......@@ -194,7 +194,7 @@ fi
#
# https://git.openstack.org/cgit/openstack/neutron/commit/?id=51f6b2e1c9c2f5f5106b9ae8316e57750f09d7c9
#
if [ $OSVERSION -ge $OSLIBERTY ]; then
if [ $OSVERSION -ge $OSLIBERTY -a $OSVERSION -lt $OSNEWTON ]; then
patch -d / -p0 < $DIRNAME/etc/neutron-liberty-ovs-agent-segmentation-id-None.patch
fi
......
......@@ -187,4 +187,11 @@ cmd = 'export AAUID="`%s | awk \'/ adminapi / {print $2}\'`" ; export AUID="`%s
print "Running adminapi -> admin key import: %s..." % (cmd,)
os.system(cmd)
#
# Ugh, the tables are now split between nova and nova_api ... so just do this too.
#
cmd = 'export AAUID="`%s | awk \'/ adminapi / {print $2}\'`" ; export AUID="`%s | awk \'/ admin / {print $2}\'`" ; mysqldump -u nova --password=%s nova_api -t key_pairs --skip-comments --quote-names --no-create-info --no-create-db --complete-insert --compact | sed -e \'s/,[0-9]*,/,NULL,/gi\' | sed -e "s/,\'${AAUID}\',/,\'${AUID}\',/gi" | mysql -u nova --password=%s nova_api ; echo "update key_pairs set deleted=0" | mysql -u nova_api --password=%s nova' % (os_cred_stuff,os_cred_stuff,NOVA_DBPASS,NOVA_DBPASS,NOVA_DBPASS,)
print "Running adminapi -> admin key import: %s..." % (cmd,)
os.system(cmd)
sys.exit(0)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment