diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-07-15 06:19:13 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-07-15 06:19:13 +0000 |
commit | 2185b835602ffb276b8142db68d472611fdf127a (patch) | |
tree | 50c351054ae33f3750e2a3a0a218432ddc6dcf02 /docker/services/heat-api-cfn.yaml | |
parent | 07a5fe1ba66cbad5afafbbd30d2d78129cb90bae (diff) | |
parent | e76d84f784d27a7a2d9e5f3a8b019f8254cb4d6c (diff) |
Merge "Use a single configuration file for specifying docker containers."
Diffstat (limited to 'docker/services/heat-api-cfn.yaml')
-rw-r--r-- | docker/services/heat-api-cfn.yaml | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/docker/services/heat-api-cfn.yaml b/docker/services/heat-api-cfn.yaml index c4129852..aff0f1a1 100644 --- a/docker/services/heat-api-cfn.yaml +++ b/docker/services/heat-api-cfn.yaml @@ -4,18 +4,12 @@ description: > OpenStack containerized Heat API CFN service parameters: - DockerNamespace: - description: namespace - default: 'tripleoupstream' - type: string DockerHeatApiCfnImage: description: image - default: 'centos-binary-heat-api-cfn:latest' type: string # puppet needs the heat-wsgi-api-cfn binary from centos-binary-heat-api-cfn DockerHeatApiCfnConfigImage: description: The container image to use for the heat_api_cfn config_volume - default: 'centos-binary-heat-api-cfn:latest' type: string EndpointMap: default: {} @@ -83,10 +77,7 @@ outputs: config_volume: heat_api_cfn puppet_tags: heat_config,file,concat,file_line step_config: *step_config - config_image: - list_join: - - '/' - - [ {get_param: DockerNamespace}, {get_param: DockerHeatApiCfnConfigImage} ] + config_image: {get_param: DockerHeatApiCfnConfigImage} kolla_config: /var/lib/kolla/config_files/heat_api_cfn.json: command: /usr/sbin/httpd -DFOREGROUND @@ -102,10 +93,7 @@ outputs: docker_config: step_4: heat_api_cfn: - image: - list_join: - - '/' - - [ {get_param: DockerNamespace}, {get_param: DockerHeatApiCfnImage} ] + image: {get_param: DockerHeatApiCfnImage} net: host privileged: false restart: always |