From b3c73a7e9924037ab29aff547b3096c8f5fb1a62 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Fri, 23 Sep 2016 15:39:33 +0100 Subject: Replace per role manifests with a common role manifest This removes the (nearly empty) per role manifests, and replaces them with a generic manifest, where we use str_replace to substitute the role name at runtime (or in some cases a subset of the name for backwards compatibility) Change-Id: I79da0f523189959b783bbcbb3b0f37be778e02fe Partial-Bug: #1626976 --- puppet/manifests/overcloud_role.pp | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 puppet/manifests/overcloud_role.pp (limited to 'puppet/manifests/overcloud_role.pp') diff --git a/puppet/manifests/overcloud_role.pp b/puppet/manifests/overcloud_role.pp new file mode 100644 index 00000000..1a59620c --- /dev/null +++ b/puppet/manifests/overcloud_role.pp @@ -0,0 +1,26 @@ +# 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. + +# 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} -- cgit 1.2.3-korg