diff options
author | Martin André <m.andre@redhat.com> | 2017-06-23 18:21:43 +0200 |
---|---|---|
committer | Martin André <m.andre@redhat.com> | 2017-06-28 10:48:53 +0200 |
commit | a474ae82d5f157a48c997fb9df420442bd79dcbe (patch) | |
tree | 567735ea0e9dbd668b908740dc4526e99ef5a289 /docker/services/neutron-dhcp.yaml | |
parent | 8c41b702f5b1c7baf2f2160b92067bcc0267c958 (diff) |
Add heat parameter for all of config_volume images
This commit consistently defines a heat template parameter in the form
of DockerXXXConfigImage where XXX represents the name of the
config_volume that is used by docker-puppet.
The goal is to mitigate hard to debug errors where the templates would
set different defaults for the image docker-puppet.py uses to run, for
the same config_volume name.
This fixes a couple of inconsistencies on the way.
Change-Id: I212020a76622a03521385a6cae4ce73e51ce5b6b
Closes-Bug: #1699791
Diffstat (limited to 'docker/services/neutron-dhcp.yaml')
-rw-r--r-- | docker/services/neutron-dhcp.yaml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/docker/services/neutron-dhcp.yaml b/docker/services/neutron-dhcp.yaml index d14f5251..a2bd07ff 100644 --- a/docker/services/neutron-dhcp.yaml +++ b/docker/services/neutron-dhcp.yaml @@ -12,9 +12,8 @@ parameters: description: image default: 'centos-binary-neutron-dhcp-agent:latest' type: string - # we configure all neutron services in the same neutron DockerNeutronConfigImage: - description: image + description: The container image to use for the neutron config_volume default: 'centos-binary-neutron-server:latest' type: string EndpointMap: |