diff options
| author |   Sofer Athlan-Guyot <sathlang@redhat.com> | 2017-02-14 14:20:23 +0100 |
|---|---|---|
| committer |   Marios Andreou <marios@redhat.com> | 2017-02-17 09:39:26 +0000 |
| commit | 3440d9d8caa26f0360be9d9d6110ff46e6e8ddb6 (patch) | |
| tree | cc0de934a114e58c54fe1a6f158eb9fae0fb4505 /puppet/major_upgrade_steps.j2.yaml | |
| parent | aef946f8453d81b8bb6b20f5539e5949209af8a9 (diff) | |
Apply puppet in non-controller script in step.
We want to apply a puppet manifest for the non-controller role, but we
need to apply it in stages. By loading the proper hieradata we get the
needed step configuration.
Change-Id: I07bfeee7b7d9a9b8c2c20e5d5c9ed735d0bfc842
Closes-Bug: #1664304
(cherry picked from commit 237cd2004a2c0869d60d0e11e9dccd59e809ff90)
Diffstat (limited to 'puppet/major_upgrade_steps.j2.yaml')
| -rw-r--r-- | puppet/major_upgrade_steps.j2.yaml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/puppet/major_upgrade_steps.j2.yaml b/puppet/major_upgrade_steps.j2.yaml index 3362a01f..6f2dd684 100644 --- a/puppet/major_upgrade_steps.j2.yaml +++ b/puppet/major_upgrade_steps.j2.yaml @@ -79,6 +79,7 @@ resources: AUTH_URL: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]} ROLE_NAME: {{role.name}} - get_file: ../extraconfig/tasks/pacemaker_common_functions.sh + - get_file: ../extraconfig/tasks/run_puppet.sh - get_file: ../extraconfig/tasks/tripleo_upgrade_node.sh {{role.name}}DeliverUpgradeScriptDeployment: |