diff options
author | 2017-07-15 06:19:13 +0000 | |
---|---|---|
committer | 2017-07-15 06:19:13 +0000 | |
commit | 2185b835602ffb276b8142db68d472611fdf127a (patch) | |
tree | 50c351054ae33f3750e2a3a0a218432ddc6dcf02 /docker/services/heat-engine.yaml | |
parent | 07a5fe1ba66cbad5afafbbd30d2d78129cb90bae (diff) | |
parent | e76d84f784d27a7a2d9e5f3a8b019f8254cb4d6c (diff) |
Merge "Use a single configuration file for specifying docker containers."
Diffstat (limited to 'docker/services/heat-engine.yaml')
-rw-r--r-- | docker/services/heat-engine.yaml | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/docker/services/heat-engine.yaml b/docker/services/heat-engine.yaml index 8cad7089..789f3f9d 100644 --- a/docker/services/heat-engine.yaml +++ b/docker/services/heat-engine.yaml @@ -4,17 +4,11 @@ description: > OpenStack containerized Heat Engine service parameters: - DockerNamespace: - description: namespace - default: 'tripleoupstream' - type: string DockerHeatEngineImage: description: image - default: 'centos-binary-heat-engine:latest' type: string DockerHeatConfigImage: description: The container image to use for the heat config_volume - default: 'centos-binary-heat-api:latest' type: string EndpointMap: default: {} @@ -76,10 +70,7 @@ outputs: config_volume: heat puppet_tags: heat_config,file,concat,file_line step_config: *step_config - config_image: - list_join: - - '/' - - [ {get_param: DockerNamespace}, {get_param: DockerHeatConfigImage} ] + config_image: {get_param: DockerHeatConfigImage} kolla_config: /var/lib/kolla/config_files/heat_engine.json: command: /usr/bin/heat-engine --config-file /usr/share/heat/heat-dist.conf --config-file /etc/heat/heat.conf @@ -96,10 +87,7 @@ outputs: # db sync runs before permissions set by kolla_config step_2: heat_init_log: - image: &heat_engine_image - list_join: - - '/' - - [ {get_param: DockerNamespace}, {get_param: DockerHeatEngineImage} ] + image: &heat_engine_image {get_param: DockerHeatEngineImage} user: root volumes: - /var/log/containers/heat:/var/log/heat |