Remove old ControllerConfig override from puppet-pacemaker.yaml
Previously we had to override the location of the manifest file pushed on the controller nodes when deploying with Pacemaker, this is not needed anymore with composable roles. Change-Id: I1e010099263a325d06483f498c70582b008c31e2
This commit is contained in:
parent
7057ec6f7c
commit
4b8720e6c1
|
@ -1,7 +1,6 @@
|
||||||
# An environment which enables configuration of an
|
# An environment which enables configuration of an
|
||||||
# Overcloud controller with Pacemaker.
|
# Overcloud controller with Pacemaker.
|
||||||
resource_registry:
|
resource_registry:
|
||||||
OS::TripleO::ControllerConfig: ../puppet/controller-config-pacemaker.yaml
|
|
||||||
OS::TripleO::Tasks::ControllerPrePuppet: ../extraconfig/tasks/pre_puppet_pacemaker.yaml
|
OS::TripleO::Tasks::ControllerPrePuppet: ../extraconfig/tasks/pre_puppet_pacemaker.yaml
|
||||||
OS::TripleO::Tasks::ControllerPostPuppet: ../extraconfig/tasks/post_puppet_pacemaker.yaml
|
OS::TripleO::Tasks::ControllerPostPuppet: ../extraconfig/tasks/post_puppet_pacemaker.yaml
|
||||||
OS::TripleO::Tasks::ControllerPostPuppetRestart: ../extraconfig/tasks/post_puppet_pacemaker_restart.yaml
|
OS::TripleO::Tasks::ControllerPostPuppetRestart: ../extraconfig/tasks/post_puppet_pacemaker_restart.yaml
|
||||||
|
|
|
@ -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}
|
|
|
@ -1,21 +0,0 @@
|
||||||
# Copyright 2015 Red Hat, Inc.
|
|
||||||
# All Rights Reserved.
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
||||||
# not use this file except in compliance with the License. You may obtain
|
|
||||||
# a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
||||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
||||||
# License for the specific language governing permissions and limitations
|
|
||||||
# under the License.
|
|
||||||
|
|
||||||
if hiera('step') >= 4 {
|
|
||||||
hiera_include('controller_classes', [])
|
|
||||||
}
|
|
||||||
|
|
||||||
$package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_controller_pacemaker', hiera('step')])
|
|
||||||
package_manifest{$package_manifest_name: ensure => present}
|
|
|
@ -24,3 +24,7 @@ if hiera('step') >= 4 {
|
||||||
|
|
||||||
$package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud___ROLE__', hiera('step')])
|
$package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud___ROLE__', hiera('step')])
|
||||||
package_manifest{$package_manifest_name: ensure => present}
|
package_manifest{$package_manifest_name: ensure => present}
|
||||||
|
|
||||||
|
# NOTE(gfidente): ensure deprecated package manifest is absent, can be removed after Pike
|
||||||
|
$absent_package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_controller_pacemaker', hiera('step')])
|
||||||
|
package_manifest{$absent_package_manifest_name: ensure => absent}
|
||||||
|
|
Loading…
Reference in New Issue