X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fconfig.role.j2.yaml;h=7337d0624dca68a59caa35c5875ee5fa31ee00d1;hb=71102bcc369b5f45a0960073954ad3ca835f62e7;hp=e59a0216f8cc12941e4cbb64441f38d0ee7f59dc;hpb=a3f9cf1314ae2d29ba68c012069dcc2b2431aa05;p=apex-tripleo-heat-templates.git

diff --git a/puppet/config.role.j2.yaml b/puppet/config.role.j2.yaml
index e59a0216..7337d062 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: ocata
 
 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: