diff options
author | Steven Hardy <shardy@redhat.com> | 2017-02-02 12:03:03 +0000 |
---|---|---|
committer | Steven Hardy <shardy@redhat.com> | 2017-02-03 11:43:47 +0000 |
commit | 87af02d67336ff26c47f67c40df23dad9e66b7fd (patch) | |
tree | 58b1a484dbda146d8bd1e24def5c90276089e311 /puppet/post-upgrade.j2.yaml | |
parent | ec24ed7dd82fd4c1553085719e369b545c4beedd (diff) |
Disable puppet on upgrade for roles not upgrading
Where the role has disabled upgrades, we need to skip both the ansible and
puppet steps. To do this we refactor the post.j2.yaml so that it can be
included in the upgrade template with an adjusted list of roles.
Note this requires https://review.openstack.org/#/c/425220/ - this
change will be required for local testing of this patch
(run mistral-db-mange populate after updating tripleo-common
and restart the mistral services, or update your repos and re-run
openstack undercloud install).
Partially-Implements: blueprint overcloud-upgrades-per-service
Change-Id: Ie7d0fa6fef3528bd93e6cde076b964ea8de3185a
Diffstat (limited to 'puppet/post-upgrade.j2.yaml')
-rw-r--r-- | puppet/post-upgrade.j2.yaml | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/puppet/post-upgrade.j2.yaml b/puppet/post-upgrade.j2.yaml new file mode 100644 index 00000000..b84039de --- /dev/null +++ b/puppet/post-upgrade.j2.yaml @@ -0,0 +1,27 @@ +heat_template_version: ocata + +description: > + Post-upgrade configuration steps via puppet for all roles + where upgrade is not disabled as defined in ../roles_data.yaml + +parameters: + servers: + type: json + description: Mapping of Role name e.g Controller to a list of servers + + role_data: + type: json + description: Mapping of Role name e.g Controller to the per-role data + + DeployIdentifier: + default: '' + type: string + description: > + Setting this to a unique value will re-run any deployment tasks which + perform configuration on a Heat stack-update. + +resources: +# Note the include here is the same as post.j2.yaml but the data used at +# the time of rendering is different if any roles disable upgrades +{% set roles = roles|rejectattr('disable_upgrade_deployment')|list -%} +{% include 'puppet-steps.j2' %} |