diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-06-29 20:12:59 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-06-29 20:12:59 +0000 |
commit | e8d8eae59cf7fac1378ddb6dc78c847abb77c22f (patch) | |
tree | 2290212e2b6f529824dc499badfba578a892421b /docker/services/nova-placement.yaml | |
parent | 3b7de8a2514cf9b90ee7aec3365bfbf4547175ad (diff) | |
parent | a474ae82d5f157a48c997fb9df420442bd79dcbe (diff) |
Merge "Add heat parameter for all of config_volume images"
Diffstat (limited to 'docker/services/nova-placement.yaml')
-rw-r--r-- | docker/services/nova-placement.yaml | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/docker/services/nova-placement.yaml b/docker/services/nova-placement.yaml index 8f06f731..251bbaad 100644 --- a/docker/services/nova-placement.yaml +++ b/docker/services/nova-placement.yaml @@ -12,6 +12,10 @@ parameters: description: image default: 'centos-binary-nova-placement-api:latest' type: string + DockerNovaPlacementConfigImage: + description: The container image to use for the nova_placement config_volume + default: 'centos-binary-nova-placement-api:latest' + type: string EndpointMap: default: {} description: Mapping of service endpoint -> protocol. Typically set @@ -66,10 +70,10 @@ outputs: config_volume: nova_placement puppet_tags: nova_config step_config: *step_config - config_image: &nova_placement_image + config_image: list_join: - '/' - - [ {get_param: DockerNamespace}, {get_param: DockerNovaPlacementImage} ] + - [ {get_param: DockerNamespace}, {get_param: DockerNovaPlacementConfigImage} ] kolla_config: /var/lib/kolla/config_files/nova_placement.json: command: /usr/sbin/httpd -DFOREGROUND @@ -82,7 +86,10 @@ outputs: step_3: nova_placement: start_order: 1 - image: *nova_placement_image + image: + list_join: + - '/' + - [ {get_param: DockerNamespace}, {get_param: DockerNovaPlacementImage} ] net: host user: root restart: always |