bb9fd2c61a
This was lost in the translation to ansible, but it's needed to enable existing interfaces such as hiera includes via *ExtraConfig. For reference this problem was introduced in: I674a4d9d2c77d1f6fbdb0996f6c9321848e32662 and this fix only considers returning the behaviour prior to that patch (for the baremetal puppet apply), further discussion is required on if/how this could be applied to the new container architecture. Change-Id: I0384edb23eed336b95ffe6293fe7d4248447e849 Partial-Bug: #1742663
30 lines
1.1 KiB
Puppet
30 lines
1.1 KiB
Puppet
# Copyright 2014 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.
|
|
|
|
# Common config, from tripleo-heat-templates/puppet/manifests/overcloud_common.pp
|
|
# The content of this file will be used to generate
|
|
# the puppet manifests for all roles, the placeholder
|
|
# __ROLE__ will be replaced by 'controller', 'blockstorage',
|
|
# 'cephstorage' and all the deployed roles.
|
|
|
|
if hiera('step') >= 4 {
|
|
hiera_include('__ROLE___classes', [])
|
|
}
|
|
|
|
$package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud___ROLE__', hiera('step')])
|
|
package_manifest{$package_manifest_name: ensure => present}
|
|
|
|
# End of overcloud_common.pp
|