summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-23 10:09:21 +0000
committerGerrit Code Review <review@openstack.org>2016-11-23 10:09:21 +0000
commit48c1daac3438fa12a3144b499bcc62f4a7cf87d0 (patch)
treee121e00f7276f4603d05daad88a38736d600660c /puppet
parent22b01f75dd32ea910abba93ea5f62c81ae096996 (diff)
parent6e866224fd2ca22933f5138e36e512f12074e46e (diff)
Merge "Containerized Services for Composable Roles"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/config.role.j2.yaml17
1 files changed, 16 insertions, 1 deletions
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: