diff options
| author |   Jiri Stransky <jistr@redhat.com> | 2015-06-04 16:20:52 +0200 |
|---|---|---|
| committer | Jiri Stransky <jistr@redhat.com> | 2015-07-01 13:54:00 +0200 |
| commit | 1787fbc7ca58f9965cd5d64b685c1f9beed4cb9b (patch) | |
| tree | 3b535f75d170cab13208d8442f8bb2a09ef4cc91 /puppet/controller-post-puppet.yaml | |
| parent | 5d1738f6e3fcdd73bb3fa1c64df9bb295bb42184 (diff) | |
Allow to enable fencing, pass through fencing config
Add two new parameters: EnableFencing and FencingConfig.
FencingConfig is a json with an expected structure documented in the
templates. It gets passed further to puppet-tripleo, which configures
the fencing devices.
Fencing is configured and enabled in the last step after all pacemaker
resources and constraints have been created, which should be a more
stable approach than the other way round.
Change-Id: Ifd432bfd2443b6d13e7efa006d4120bb0eaa2554
Depends-On: I819fc8c126ec47cd207c59b3dcf92ff699649c5a
Depends-On: I8b7adff6f05f864115071c51810b41efad887584
Diffstat (limited to 'puppet/controller-post-puppet.yaml')
| -rw-r--r-- | puppet/controller-post-puppet.yaml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/puppet/controller-post-puppet.yaml b/puppet/controller-post-puppet.yaml index e88561e6..49cbe1e2 100644 --- a/puppet/controller-post-puppet.yaml +++ b/puppet/controller-post-puppet.yaml @@ -83,6 +83,16 @@ resources: step: 4 update_identifier: {get_param: NodeConfigIdentifiers} + ControllerOvercloudServicesDeployment_Step6: + type: OS::Heat::StructuredDeployments + depends_on: ControllerOvercloudServicesDeployment_Step5 + properties: + servers: {get_param: servers} + config: {get_resource: ControllerPuppetConfig} + input_values: + step: 5 + update_identifier: {get_param: NodeConfigIdentifiers} + # Note, this should come last, so use depends_on to ensure # this is created after any other resources. ExtraConfig: |