Merge "Configure nova neutron parameter for L to M upgrade" into stable/mitaka
This commit is contained in:
commit
056d26062c
|
@ -0,0 +1,43 @@
|
||||||
|
#!/bin/bash
|
||||||
|
#
|
||||||
|
# This delivers the compute upgrade script to be invoked as part of the tripleo
|
||||||
|
# major upgrade workflow.
|
||||||
|
#
|
||||||
|
set -eu
|
||||||
|
|
||||||
|
UPGRADE_SCRIPT=/root/liberty_to_mitaka_neutron_auth_param.pp
|
||||||
|
|
||||||
|
cat > $UPGRADE_SCRIPT << ENDOFCAT
|
||||||
|
# Copyright 2015 Red Hat, Inc.
|
||||||
|
# All Rights Reserved.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||||
|
# not use this file except in compliance with the License. You may obtain
|
||||||
|
# a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
# License for the specific language governing permissions and limitations
|
||||||
|
# under the License.
|
||||||
|
|
||||||
|
# This puppet manifest is to be used only during a Liberty->Mitaka upgrade
|
||||||
|
# It creates the nova api database during the controller upgrade instead of
|
||||||
|
# during the converge step.
|
||||||
|
|
||||||
|
if str2bool(hiera('nova::compute::enabled', false)) {
|
||||||
|
class{ 'nova::network::neutron':
|
||||||
|
neutron_auth_plugin => 'v3password',
|
||||||
|
neutron_username => hiera('nova::network::neutron::neutron_username'),
|
||||||
|
neutron_password => hiera('nova::network::neutron::neutron_password'),
|
||||||
|
neutron_auth_url => hiera('nova::network::neutron::neutron_auth_url'),
|
||||||
|
# DEPRECATED PARAMETERS
|
||||||
|
neutron_auth_strategy => undef,
|
||||||
|
neutron_admin_tenant_name => undef,
|
||||||
|
neutron_admin_username => undef,
|
||||||
|
neutron_admin_auth_url => undef,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ENDOFCAT
|
|
@ -33,6 +33,10 @@ fi
|
||||||
yum -y install python-zaqarclient # needed for os-collect-config
|
yum -y install python-zaqarclient # needed for os-collect-config
|
||||||
yum -y update
|
yum -y update
|
||||||
|
|
||||||
|
# Update nova neutron auth parameters, to be able to launch and migrate the
|
||||||
|
# workloads before running the converge step
|
||||||
|
puppet apply /root/liberty_to_mitaka_neutron_auth_param.pp
|
||||||
|
systemctl restart openstack-nova-compute
|
||||||
ENDOFCAT
|
ENDOFCAT
|
||||||
|
|
||||||
# ensure the permissions are OK
|
# ensure the permissions are OK
|
||||||
|
|
|
@ -97,6 +97,13 @@ resources:
|
||||||
UPGRADE_LEVEL_NOVA_COMPUTE: {get_param: UpgradeLevelNovaCompute}
|
UPGRADE_LEVEL_NOVA_COMPUTE: {get_param: UpgradeLevelNovaCompute}
|
||||||
- get_file: major_upgrade_compute.sh
|
- get_file: major_upgrade_compute.sh
|
||||||
|
|
||||||
|
NovaNeutronAuthParamUpgradeConfig:
|
||||||
|
type: OS::Heat::SoftwareConfig
|
||||||
|
properties:
|
||||||
|
group: script
|
||||||
|
config:
|
||||||
|
get_file: liberty_to_mitaka_neutron_auth_param.sh
|
||||||
|
|
||||||
ComputeDeliverUpgradeScriptDeployment:
|
ComputeDeliverUpgradeScriptDeployment:
|
||||||
type: OS::Heat::SoftwareDeploymentGroup
|
type: OS::Heat::SoftwareDeploymentGroup
|
||||||
properties:
|
properties:
|
||||||
|
@ -104,6 +111,13 @@ resources:
|
||||||
config: {get_resource: ComputeDeliverUpgradeScriptConfig}
|
config: {get_resource: ComputeDeliverUpgradeScriptConfig}
|
||||||
input_values: {get_param: input_values}
|
input_values: {get_param: input_values}
|
||||||
|
|
||||||
|
NovaNeutronAuthParamUpgradeDeployment:
|
||||||
|
type: OS::Heat::SoftwareDeploymentGroup
|
||||||
|
properties:
|
||||||
|
servers: {get_param: compute_servers}
|
||||||
|
config: {get_resource: NovaNeutronAuthParamUpgradeConfig}
|
||||||
|
input_values: {get_param: input_values}
|
||||||
|
|
||||||
ObjectStorageDeliverUpgradeScriptConfig:
|
ObjectStorageDeliverUpgradeScriptConfig:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
properties:
|
properties:
|
||||||
|
|
Loading…
Reference in New Issue