diff options
| author |   Ian Main <imain@redhat.com> | 2016-06-15 06:46:44 +0000 |
|---|---|---|
| committer |   Flavio Percoco <flaper87@gmail.com> | 2016-11-22 11:42:49 +0100 |
| commit | 6e866224fd2ca22933f5138e36e512f12074e46e (patch) | |
| tree | f893847ee6ebb722dcad22efa97272ad761afc89 /puppet | |
| parent | 2fc81bef2f696bd9d9486a2b35d52432d8486adc (diff) | |
Containerized Services for Composable Roles
This change modifies the template interface to support containers and
converts the compute services to composable roles.
Co-Authored-By: Dan Prince <dprince@redhat.com>
Co-Authored-By: Flavio Percoco <flavio@redhat.com>
Co-Authored-By: Martin André <m.andre@redhat.com>
Co-Authored-By: Steve Baker <sbaker@redhat.com>
Change-Id: I82fa58e19de94ec78ca242154bc6ecc592112d1b
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/config.role.j2.yaml | 17 |
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: |