aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-17 09:29:01 +0000
committerGerrit Code Review <review@openstack.org>2017-02-17 09:29:01 +0000
commitfcda1872cf51df0325680edb6e7f2c9dcfaa3c2c (patch)
tree33a15febba01b71d097b81a6217a49c09fbed309 /puppet
parent4fd12f1d18eaee79a299102df370281acf4dfac3 (diff)
parent237cd2004a2c0869d60d0e11e9dccd59e809ff90 (diff)
Merge "Apply puppet in non-controller script in step."
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: