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/iscsid.yaml | |
parent | 3b7de8a2514cf9b90ee7aec3365bfbf4547175ad (diff) | |
parent | a474ae82d5f157a48c997fb9df420442bd79dcbe (diff) |
Merge "Add heat parameter for all of config_volume images"
Diffstat (limited to 'docker/services/iscsid.yaml')
-rw-r--r-- | docker/services/iscsid.yaml | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/docker/services/iscsid.yaml b/docker/services/iscsid.yaml index 53f5aff2..86f2d3b4 100644 --- a/docker/services/iscsid.yaml +++ b/docker/services/iscsid.yaml @@ -12,6 +12,10 @@ parameters: description: image default: 'centos-binary-iscsid:latest' type: string + DockerIscsidConfigImage: + description: The container image to use for the iscsid config_volume + default: 'centos-binary-iscsid:latest' + type: string EndpointMap: default: {} description: Mapping of service endpoint -> protocol. Typically set @@ -53,10 +57,10 @@ outputs: config_volume: iscsid #puppet_tags: file step_config: '' - config_image: &iscsid_image + config_image: list_join: - '/' - - [ {get_param: DockerNamespace}, {get_param: DockerIscsidImage} ] + - [ {get_param: DockerNamespace}, {get_param: DockerIscsidConfigImage} ] kolla_config: /var/lib/kolla/config_files/iscsid.json: command: /usr/sbin/iscsid -f @@ -64,7 +68,10 @@ outputs: step_3: iscsid: start_order: 2 - image: *iscsid_image + image: + list_join: + - '/' + - [ {get_param: DockerNamespace}, {get_param: DockerIscsidImage} ] net: host privileged: true restart: always |