From 6e866224fd2ca22933f5138e36e512f12074e46e Mon Sep 17 00:00:00 2001 From: Ian Main Date: Wed, 15 Jun 2016 06:46:44 +0000 Subject: Containerized Services for Composable Roles MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change modifies the template interface to support containers and converts the compute services to composable roles. Co-Authored-By: Dan Prince Co-Authored-By: Flavio Percoco Co-Authored-By: Martin André Co-Authored-By: Steve Baker Change-Id: I82fa58e19de94ec78ca242154bc6ecc592112d1b --- puppet/config.role.j2.yaml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'puppet') diff --git a/puppet/config.role.j2.yaml b/puppet/config.role.j2.yaml index e59a0216..552c59b2 100644 --- a/puppet/config.role.j2.yaml +++ b/puppet/config.role.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2015-04-30 +heat_template_version: 2016-10-14 description: > A software config which runs puppet on the {{role}} role @@ -12,6 +12,14 @@ parameters: type: string description: Config manifests that will be used to step through the deployment. default: '' + PuppetTags: + type: string + description: List of comma-separated tags to limit puppet catalog to. + default: '' + +conditions: + + puppet_tags_empty: {equals : [{get_param: PuppetTags}, '']} resources: @@ -24,6 +32,13 @@ resources: enable_hiera: True enable_facter: False modulepath: /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules + tags: + if: + - puppet_tags_empty + - '' + - list_join: + - ',' + - ['file,concat,file_line', {get_param: PuppetTags}] outputs: - name: result inputs: -- cgit 1.2.3-korg