diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-01-17 11:11:51 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-01-17 11:11:51 +0000 |
commit | 2e3ff0a6734bce712ab11f37a9dc2454f1420d76 (patch) | |
tree | 64ec94420d305ceae125f97825ccd99e1eb66f9f /puppet/controller-config-pacemaker.yaml | |
parent | 7ec199d64e2eb23b084f32bb42a1e8802fbf9931 (diff) | |
parent | 4b8720e6c1aa1d8e5a5163aefaccf5b78f48896b (diff) |
Merge "Remove old ControllerConfig override from puppet-pacemaker.yaml"
Diffstat (limited to 'puppet/controller-config-pacemaker.yaml')
-rw-r--r-- | puppet/controller-config-pacemaker.yaml | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/puppet/controller-config-pacemaker.yaml b/puppet/controller-config-pacemaker.yaml deleted file mode 100644 index 1b719839..00000000 --- a/puppet/controller-config-pacemaker.yaml +++ /dev/null @@ -1,41 +0,0 @@ -heat_template_version: ocata - -description: > - A software config which runs manifests/overcloud_controller_pacemaker.pp - -parameters: - ConfigDebug: - default: false - description: Whether to run config management (e.g. Puppet) in debug mode. - type: boolean - StepConfig: - type: string - description: Config manifests that will be used to step through the deployment. - default: '' - -resources: - - ControllerPuppetConfigImpl: - type: OS::Heat::SoftwareConfig - properties: - group: puppet - options: - enable_debug: {get_param: ConfigDebug} - enable_hiera: True - enable_facter: False - modulepath: /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules - outputs: - - name: result - inputs: - - name: step - type: Number - config: - list_join: - - '' - - - get_file: manifests/overcloud_controller_pacemaker.pp - - {get_param: StepConfig} - -outputs: - OS::stack_id: - description: The software config which runs overcloud_controller_pacemaker.pp - value: {get_resource: ControllerPuppetConfigImpl} |