diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-02-25 12:15:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-02-25 12:15:16 +0000 |
| commit | f8633a42e24b2f777f6f03d09af07346724c15b5 (patch) | |
| tree | 5e490004528c3ca5327c5295765943910f72a389 | |
| parent | 469f3be7b30eb2907669f4cd0b4cde6051d930d3 (diff) | |
| parent | 05414a743f777e01743c001574d0063cf7fc92fc (diff) | |
Merge "Add UpgradeLevelNovaCompute parameter"
| -rw-r--r-- | environments/major-upgrade-pacemaker.yaml | 3 | ||||
| -rwxr-xr-x | extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh | 2 | ||||
| -rw-r--r-- | extraconfig/tasks/major_upgrade_pacemaker.yaml | 17 |
3 files changed, 20 insertions, 2 deletions
diff --git a/environments/major-upgrade-pacemaker.yaml b/environments/major-upgrade-pacemaker.yaml index e3bbfcce..61186bb0 100644 --- a/environments/major-upgrade-pacemaker.yaml +++ b/environments/major-upgrade-pacemaker.yaml @@ -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 diff --git a/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh b/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh index bee9a939..5604bb0d 100755 --- a/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh +++ b/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh @@ -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 diff --git a/extraconfig/tasks/major_upgrade_pacemaker.yaml b/extraconfig/tasks/major_upgrade_pacemaker.yaml index 12268b0e..1080fd18 100644 --- a/extraconfig/tasks/major_upgrade_pacemaker.yaml +++ b/extraconfig/tasks/major_upgrade_pacemaker.yaml @@ -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: |