diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-05-12 03:06:32 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-05-12 03:06:32 +0000 |
| commit | bdc175be26655580004af41b1fd2cfe612ebf953 (patch) | |
| tree | 6eeef0ef558f7a4888480082518e049d34a832b5 /ci/environments/scenario002-multinode.yaml | |
| parent | 43b33c7ed8ae2b02dc552767eaa7eb1dec4fb2e1 (diff) | |
| parent | ffb7ba51e19caba276ee256f7083833e9bcf3b76 (diff) | |
Merge "Merge pre|post puppet resources into pre|post config." into stable/ocata
Diffstat (limited to 'ci/environments/scenario002-multinode.yaml')
| -rw-r--r-- | ci/environments/scenario002-multinode.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/environments/scenario002-multinode.yaml b/ci/environments/scenario002-multinode.yaml index f53ec1f6..2e6fd40f 100644 --- a/ci/environments/scenario002-multinode.yaml +++ b/ci/environments/scenario002-multinode.yaml @@ -11,8 +11,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 parameter_defaults: |