Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Enables support for configuring Cinder with Pure Storage FlashArray storage...
[apex-tripleo-heat-templates.git]
/
extraconfig
/
tasks
/
post_puppet_pacemaker.yaml
diff --git
a/extraconfig/tasks/post_puppet_pacemaker.yaml
b/extraconfig/tasks/post_puppet_pacemaker.yaml
index
7de41d9
..
a304e55
100644
(file)
--- a/
extraconfig/tasks/post_puppet_pacemaker.yaml
+++ b/
extraconfig/tasks/post_puppet_pacemaker.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
2014-10-16
+heat_template_version:
ocata
description: 'Post-Puppet Config for Pacemaker deployments'
parameters:
description: 'Post-Puppet Config for Pacemaker deployments'
parameters:
@@
-25,20
+25,13
@@
resources:
ControllerPostPuppetMaintenanceModeDeployment:
type: OS::Heat::SoftwareDeployments
properties:
ControllerPostPuppetMaintenanceModeDeployment:
type: OS::Heat::SoftwareDeployments
properties:
- servers:
{get_param: servers}
+ servers: {get_param: servers}
config: {get_resource: ControllerPostPuppetMaintenanceModeConfig}
input_values: {get_param: input_values}
config: {get_resource: ControllerPostPuppetMaintenanceModeConfig}
input_values: {get_param: input_values}
- ControllerPostPuppetRestartConfig:
- type: OS::Heat::SoftwareConfig
- properties:
- group: script
- config: {get_file: pacemaker_resource_restart.sh}
-
- ControllerPostPuppetRestartDeployment:
- type: OS::Heat::SoftwareDeployments
+ ControllerPostPuppetRestart:
+ type: OS::TripleO::Tasks::ControllerPostPuppetRestart
depends_on: ControllerPostPuppetMaintenanceModeDeployment
properties:
depends_on: ControllerPostPuppetMaintenanceModeDeployment
properties:
- servers: {get_param: servers}
- config: {get_resource: ControllerPostPuppetRestartConfig}
+ servers: {get_param: servers}
input_values: {get_param: input_values}
input_values: {get_param: input_values}