diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-24 18:42:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-24 18:42:00 +0000 |
| commit | b364c5eb9dab93e3fb5f3bb329ee27bca32e985c (patch) | |
| tree | d2bdc7701bfa0b97496f35f290dbdc476d48fe4e /ci/environments/scenario001-multinode.yaml | |
| parent | 3042ee8b30132c76a81c41c273c8e0c9653b6662 (diff) | |
| parent | 258c6ce52d0c8467f34693722a883d96345802b2 (diff) | |
Merge "Merge pre|post puppet resources into pre|post config."
Diffstat (limited to 'ci/environments/scenario001-multinode.yaml')
| -rw-r--r-- | ci/environments/scenario001-multinode.yaml | 4 |
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 |