diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-06 10:32:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-06 10:32:52 +0000 |
| commit | 47fcabee464b1e46490087316778b3cff0a55b5b (patch) | |
| tree | f15d5fcafa2835131da9d13209930d98175cdfa9 /docker/post.j2.yaml | |
| parent | ccb13e7b4227188275cb3f8e599fa8f6f37639c0 (diff) | |
| parent | 610850140d605b18f4a28099f160fff1e489443d (diff) | |
Merge "Put docker puppet config in puppet_config dict"
Diffstat (limited to 'docker/post.j2.yaml')
| -rw-r--r-- | docker/post.j2.yaml | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/docker/post.j2.yaml b/docker/post.j2.yaml index 65d0c4ee..76232d14 100644 --- a/docker/post.j2.yaml +++ b/docker/post.j2.yaml @@ -130,16 +130,7 @@ resources: group: json-file config: /var/lib/docker-puppet/docker-puppet.json: - yaql: - # select only services that have a non-null config_image with - # a step_config as well - expression: - $.data.config_volume.zip($.data.puppet_tags, $.data.step_config, $.data.config_image).where($[3] != null and $[1] != null) - data: - config_volume: {get_param: [role_data, {{role.name}}, config_volume]} - step_config: {get_param: [role_data, {{role.name}}, step_config]} - puppet_tags: {get_param: [role_data, {{role.name}}, puppet_tags]} - config_image: {get_param: [role_data, {{role.name}}, config_image]} + {get_param: [role_data, {{role.name}}, puppet_config]} {{role.name}}GenPuppetDeployment: type: OS::Heat::SoftwareDeploymentGroup |