diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-02-17 21:53:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-02-17 21:53:27 +0000 |
| commit | 2da48b89b0fb7157ec567bd4fe677b47ca0cca49 (patch) | |
| tree | 7f999395a22edd1d30e15a687db2bdcc9d79bd75 /puppet | |
| parent | efd866a58bab768a37d01de4d85e5e4870410cee (diff) | |
| parent | 3440d9d8caa26f0360be9d9d6110ff46e6e8ddb6 (diff) | |
Merge "Apply puppet in non-controller script in step." into stable/ocata
Diffstat (limited to 'puppet')
| -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: |