diff options
| author |   Zuul <zuul@review.openstack.org> | 2017-11-09 08:25:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-11-09 08:25:43 +0000 |
| commit | 7558bfba986cf993d775f5fee3f327cc88cdddac (patch) | |
| tree | 9deab273cd1e89d1e0c9d4b5141fb4899114792f | |
| parent | 69545a0067dd8687c4991dc4d2717cab428c486d (diff) | |
| parent | bcea7e76f4e766a1c04b1e14048da9ab08d42b86 (diff) | |
Merge "Do not set cluster in maintenance mode during split stack upgrade" into stable/pike
| -rw-r--r-- | environments/deployed-server-pacemaker-environment.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/environments/deployed-server-pacemaker-environment.yaml b/environments/deployed-server-pacemaker-environment.yaml index cc9ea996..83d81bbd 100644 --- a/environments/deployed-server-pacemaker-environment.yaml +++ b/environments/deployed-server-pacemaker-environment.yaml @@ -1,4 +1,4 @@ resource_registry: - OS::TripleO::Tasks::ControllerDeployedServerPreConfig: ../extraconfig/tasks/pre_puppet_pacemaker.yaml - OS::TripleO::Tasks::ControllerDeployedServerPostConfig: ../extraconfig/tasks/post_puppet_pacemaker.yaml + OS::TripleO::Tasks::ControllerDeployedServerPreConfig: OS::Heat::None + OS::TripleO::Tasks::ControllerDeployedServerPostConfig: OS::Heat::None OS::TripleO::Tasks::ControllerDeployedServerPostPuppetRestart: ../extraconfig/tasks/post_puppet_pacemaker_restart.yaml |