Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Update net-config-noop to use apply-config"
[apex-tripleo-heat-templates.git]
/
puppet
/
config.role.j2.yaml
diff --git
a/puppet/config.role.j2.yaml
b/puppet/config.role.j2.yaml
index
e59a021
..
7337d06
100644
(file)
--- 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:
ocata
description: >
A software config which runs puppet on the {{role}} role
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: ''
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:
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
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:
outputs:
- name: result
inputs: