summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorSofer Athlan-Guyot <sathlang@redhat.com>2017-02-14 14:20:23 +0100
committerSofer Athlan-Guyot <sathlang@redhat.com>2017-02-15 16:41:39 +0100
commit237cd2004a2c0869d60d0e11e9dccd59e809ff90 (patch)
treefecd91f1bd6d1b5032a0219b212929e0a68eae8e /puppet
parent093949dc5d102d13d857e18427ce671861dc6352 (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
Diffstat (limited to 'puppet')
-rw-r--r--puppet/major_upgrade_steps.j2.yaml1
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: