From ab83e7731c78d44b05243d6242d026a97f4e170a Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Mon, 6 Mar 2017 13:58:10 -0500 Subject: Remove docker_image sections (unused) We don't use docker_image for anything. It is a remant of the pre-composable docker templates and we can now remove it. This patch removes references to the 'docker_image' section from docker/post.yaml and all of the docker/services* templates. Change-Id: I208c1ef1550ab39ab0ee47ab282f9b1937379810 --- docker/services/heat-engine.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'docker/services/heat-engine.yaml') diff --git a/docker/services/heat-engine.yaml b/docker/services/heat-engine.yaml index c60a3840..85a00b1d 100644 --- a/docker/services/heat-engine.yaml +++ b/docker/services/heat-engine.yaml @@ -50,15 +50,14 @@ outputs: get_attr: [HeatBase, role_data, step_config] service_config_settings: {get_attr: [HeatBase, role_data, service_config_settings]} # BEGIN DOCKER SETTINGS - docker_image: &heat_engine_image - list_join: - - '/' - - [ {get_param: DockerNamespace}, {get_param: DockerHeatEngineImage} ] puppet_config: config_volume: heat puppet_tags: heat_config,file,concat,file_line step_config: *step_config - config_image: *heat_engine_image + config_image: &heat_engine_image + list_join: + - '/' + - [ {get_param: DockerNamespace}, {get_param: DockerHeatEngineImage} ] 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 -- cgit 1.2.3-korg