Add UpgradeLevelNovaCompute parameter
This parameter can be used for pinning (and later unpinning) the Nova Compute RPC version. Change-Id: I2f181f3b01f0b8059566d01db0152a12bbbd1c3e
This commit is contained in:
parent
0dd10ffe4f
commit
05414a743f
|
@ -1,3 +1,6 @@
|
|||
parameter_defaults:
|
||||
UpgradeLevelNovaCompute: liberty
|
||||
|
||||
resource_registry:
|
||||
OS::TripleO::Tasks::UpdateWorkflow: ../extraconfig/tasks/major_upgrade_pacemaker.yaml
|
||||
OS::TripleO::Tasks::PackageUpdate: ../extraconfig/tasks/yum_update_noop.yaml
|
||||
|
|
|
@ -49,7 +49,7 @@ done
|
|||
yum update -y
|
||||
|
||||
# Pin messages sent to compute nodes to kilo, these will be upgraded later
|
||||
crudini --set /etc/nova/nova.conf upgrade_levels compute liberty
|
||||
crudini --set /etc/nova/nova.conf upgrade_levels compute "$upgrade_level_nova_compute"
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1284047
|
||||
# Change-Id: Ib3f6c12ff5471e1f017f28b16b1e6496a4a4b435
|
||||
crudini --set /etc/ceilometer/ceilometer.conf DEFAULT rpc_backend rabbit
|
||||
|
|
|
@ -16,7 +16,16 @@ parameters:
|
|||
type: json
|
||||
description: input values for the software deployments
|
||||
|
||||
UpgradeLevelNovaCompute:
|
||||
type: string
|
||||
description: Nova Compute upgrade level
|
||||
default: ''
|
||||
|
||||
resources:
|
||||
# TODO(jistr): for Mitaka->Newton upgrades and further we can use
|
||||
# map_merge with input_values instead of feeding params into scripts
|
||||
# via str_replace on bash snippets
|
||||
|
||||
ControllerPacemakerUpgradeConfig_Step1:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
properties:
|
||||
|
@ -24,7 +33,13 @@ resources:
|
|||
config:
|
||||
list_join:
|
||||
- ''
|
||||
- - get_file: pacemaker_common_functions.sh
|
||||
- - str_replace:
|
||||
template: |
|
||||
#!/bin/bash
|
||||
upgrade_level_nova_compute='UPGRADE_LEVEL_NOVA_COMPUTE'
|
||||
params:
|
||||
UPGRADE_LEVEL_NOVA_COMPUTE: {get_param: UpgradeLevelNovaCompute}
|
||||
- get_file: pacemaker_common_functions.sh
|
||||
- get_file: major_upgrade_controller_pacemaker_1.sh
|
||||
|
||||
ControllerPacemakerUpgradeDeployment_Step1:
|
||||
|
|
Loading…
Reference in New Issue