Remove overcloud_common.pp
This has not been useful for a while, cleaning this up. Change-Id: I3612f760fb0dd2e69fdcd1327b6915a502f1cab7
This commit is contained in:
parent
85100b8bfc
commit
7ffa24c8ac
@ -64,20 +64,14 @@ resources:
|
||||
properties:
|
||||
type: string
|
||||
value:
|
||||
list_join:
|
||||
- "\n"
|
||||
- - str_replace:
|
||||
template: {get_file: ../../puppet/manifests/overcloud_common.pp}
|
||||
params:
|
||||
__ROLE__: {get_param: RoleName}
|
||||
- yaql:
|
||||
expression:
|
||||
# select 'step_config' only from services that do not have a docker_config
|
||||
coalesce($.data.service_names, []).zip(coalesce($.data.step_config, []), coalesce($.data.docker_config, [])).where($[2] = null).where($[1] != null).select($[1]).join("\n")
|
||||
data:
|
||||
service_names: {get_attr: [ServiceChain, role_data, service_name]}
|
||||
step_config: {get_attr: [ServiceChain, role_data, step_config]}
|
||||
docker_config: {get_attr: [ServiceChain, role_data, docker_config]}
|
||||
yaql:
|
||||
expression:
|
||||
# select 'step_config' only from services that do not have a docker_config
|
||||
coalesce($.data.service_names, []).zip(coalesce($.data.step_config, []), coalesce($.data.docker_config, [])).where($[2] = null).where($[1] != null).select($[1]).join("\n")
|
||||
data:
|
||||
service_names: {get_attr: [ServiceChain, role_data, service_name]}
|
||||
step_config: {get_attr: [ServiceChain, role_data, step_config]}
|
||||
docker_config: {get_attr: [ServiceChain, role_data, docker_config]}
|
||||
|
||||
DockerConfig:
|
||||
type: OS::Heat::Value
|
||||
|
@ -1,29 +0,0 @@
|
||||
# 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
|
Loading…
Reference in New Issue
Block a user