aboutsummaryrefslogtreecommitdiffstats
path: root/ci/environments/multinode_major_upgrade.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-24 18:42:00 +0000
committerGerrit Code Review <review@openstack.org>2017-04-24 18:42:00 +0000
commitb364c5eb9dab93e3fb5f3bb329ee27bca32e985c (patch)
treed2bdc7701bfa0b97496f35f290dbdc476d48fe4e /ci/environments/multinode_major_upgrade.yaml
parent3042ee8b30132c76a81c41c273c8e0c9653b6662 (diff)
parent258c6ce52d0c8467f34693722a883d96345802b2 (diff)
Merge "Merge pre|post puppet resources into pre|post config."
Diffstat (limited to 'ci/environments/multinode_major_upgrade.yaml')
-rw-r--r--ci/environments/multinode_major_upgrade.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/environments/multinode_major_upgrade.yaml b/ci/environments/multinode_major_upgrade.yaml
index 8a520b57..609e06ff 100644
--- a/ci/environments/multinode_major_upgrade.yaml
+++ b/ci/environments/multinode_major_upgrade.yaml
@@ -7,8 +7,8 @@ resource_registry:
OS::TripleO::Services::MySQL: ../../puppet/services/pacemaker/database/mysql.yaml
OS::TripleO::Services::CinderVolume: ../../puppet/services/pacemaker/cinder-volume.yaml
OS::TripleO::Services::Keepalived: OS::Heat::None
- OS::TripleO::Tasks::ControllerPrePuppet: ../../extraconfig/tasks/pre_puppet_pacemaker.yaml
- OS::TripleO::Tasks::ControllerPostPuppet: ../../extraconfig/tasks/post_puppet_pacemaker.yaml
+ OS::TripleO::Tasks::ControllerPreConfig: ../../extraconfig/tasks/pre_puppet_pacemaker.yaml
+ OS::TripleO::Tasks::ControllerPostConfig: ../../extraconfig/tasks/post_puppet_pacemaker.yaml
OS::TripleO::Tasks::ControllerPostPuppetRestart: ../../extraconfig/tasks/post_puppet_pacemaker_restart.yaml
parameter_defaults: