aboutsummaryrefslogtreecommitdiffstats
path: root/ci/environments/scenario001-multinode.yaml
diff options
context:
space:
mode:
authorCarlos Camacho <ccamacho@redhat.com>2017-04-03 14:24:06 +0200
committerCarlos Camacho <ccamacho@redhat.com>2017-04-24 12:56:49 +0200
commit258c6ce52d0c8467f34693722a883d96345802b2 (patch)
tree327137d50e6657a95c429d13dd222714fdfe86f7 /ci/environments/scenario001-multinode.yaml
parent085d5009b6b56245b46ecb935a72d86402791c89 (diff)
Merge pre|post puppet resources into pre|post config.
The [Pre|Post]Puppet resources were renamed in https://review.openstack.org/#/c/365763. This was intended for having a pre/post deployment steps using an agnostic name instead of being attached to a technology. The renaming was unintentionally reverted in https://review.openstack.org/#/c/393644/ and https://review.openstack.org/#/c/434451. This submission merge both resources into one, and remove the old pre|post hooks. Closes-bug: #1669756 Change-Id: Ic9d97f172efd2db74255363679b60f1d2dc4e064
Diffstat (limited to 'ci/environments/scenario001-multinode.yaml')
-rw-r--r--ci/environments/scenario001-multinode.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/environments/scenario001-multinode.yaml b/ci/environments/scenario001-multinode.yaml
index 0282c385..6995deae 100644
--- a/ci/environments/scenario001-multinode.yaml
+++ b/ci/environments/scenario001-multinode.yaml
@@ -15,8 +15,8 @@ resource_registry:
OS::TripleO::Services::CinderBackup: ../../puppet/services/pacemaker/cinder-backup.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
OS::TripleO::Services::FluentdClient: /usr/share/openstack-tripleo-heat-templates/puppet/services/logging/fluentd-client.yaml
OS::TripleO::Services::SensuClient: /usr/share/openstack-tripleo-heat-templates/puppet/services/monitoring/sensu-client.yaml