diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-07-21 15:20:52 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-07-21 15:20:52 +0000 |
commit | 9f1fbcb40a030d40b3241b6684fd554e12732dd1 (patch) | |
tree | f649cd1bda429b592b1186a7fd754e2ece647bb7 /docker/services/manila-share.yaml | |
parent | fdd4352375c24c189d028f34cc66b3b1f2d474ee (diff) | |
parent | 8a305da32aaff257e01691e7d0f61abb4ed75bf3 (diff) |
Merge "Remove DockerNamespace references"
Diffstat (limited to 'docker/services/manila-share.yaml')
-rw-r--r-- | docker/services/manila-share.yaml | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/docker/services/manila-share.yaml b/docker/services/manila-share.yaml index 9733b6f9..09d1a574 100644 --- a/docker/services/manila-share.yaml +++ b/docker/services/manila-share.yaml @@ -4,17 +4,11 @@ description: > OpenStack containerized Manila Share service parameters: - DockerNamespace: - description: namespace - default: 'tripleoupstream' - type: string DockerManilaShareImage: description: image - default: 'centos-binary-manila-share:latest' type: string DockerManilaConfigImage: description: image - default: 'centos-binary-manila-base:latest' type: string EndpointMap: default: {} @@ -72,10 +66,7 @@ outputs: config_volume: manila puppet_tags: manila_config step_config: *step_config - config_image: - list_join: - - '/' - - [ {get_param: DockerNamespace}, {get_param: DockerManilaConfigImage} ] + config_image: {get_param: DockerManilaConfigImage} kolla_config: /var/lib/kolla/config_files/manila_share.json: command: /usr/bin/manila-share --config-file /usr/share/manila/manila-dist.conf --config-file /etc/manila/manila.conf @@ -96,10 +87,7 @@ outputs: docker_config: step_4: manila_share: - image: &manila_share_image - list_join: - - '/' - - [ {get_param: DockerNamespace}, {get_param: DockerManilaShareImage} ] + image: &manila_share_image {get_param: DockerManilaShareImage} net: host restart: always volumes: |