diff options
Diffstat (limited to 'puppet/controller-post-puppet.yaml')
| -rw-r--r-- | puppet/controller-post-puppet.yaml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/puppet/controller-post-puppet.yaml b/puppet/controller-post-puppet.yaml index debd7154..7aab7f5a 100644 --- a/puppet/controller-post-puppet.yaml +++ b/puppet/controller-post-puppet.yaml @@ -10,16 +10,7 @@ parameters: resources: ControllerPuppetConfig: - type: OS::Heat::SoftwareConfig - properties: - group: puppet - options: - enable_hiera: True - enable_facter: False - outputs: - - name: result - config: - get_file: manifests/overcloud_controller.pp + type: OS::TripleO::ControllerConfig # Step through a series of Puppet runs using the same manifest. # NOTE(dprince): Heat breakpoints would make for a really cool way to step @@ -72,10 +63,19 @@ resources: input_values: step: 3 + ControllerDeploymentOvercloudServices_Step5: + type: OS::Heat::StructuredDeployments + depends_on: ControllerDeploymentOvercloudServices_Step4 + properties: + servers: {get_param: servers} + config: {get_resource: ControllerPuppetConfig} + input_values: + step: 4 + # Note, this should come last, so use depends_on to ensure # this is created after any other resources. ExtraConfig: - depends_on: ControllerDeploymentOvercloudServices_Step4 + depends_on: ControllerDeploymentOvercloudServices_Step5 type: OS::TripleO::NodeExtraConfigPost properties: servers: {get_param: servers} |