aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/mistral-executor.yaml
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2017-03-06 13:58:10 -0500
committerMartin André <m.andre@redhat.com>2017-03-10 08:35:57 +0100
commitab83e7731c78d44b05243d6242d026a97f4e170a (patch)
tree5ef4da6dae081398258ea8f27f6870f82e5dd6ce /docker/services/mistral-executor.yaml
parent78b7a7ed8a6b9af70f300d98f1c7f1c4eb715629 (diff)
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
Diffstat (limited to 'docker/services/mistral-executor.yaml')
-rw-r--r--docker/services/mistral-executor.yaml9
1 files changed, 4 insertions, 5 deletions
diff --git a/docker/services/mistral-executor.yaml b/docker/services/mistral-executor.yaml
index 4228642..0274ff4 100644
--- a/docker/services/mistral-executor.yaml
+++ b/docker/services/mistral-executor.yaml
@@ -53,10 +53,6 @@ outputs:
get_attr: [MistralBase, role_data, step_config]
service_config_settings: {get_attr: [MistralBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
- docker_image: &mistral_executor_image
- list_join:
- - '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerMistralExecutorImage} ]
puppet_config:
config_volume: mistral
puppet_tags: mistral_config
@@ -76,7 +72,10 @@ outputs:
docker_config:
step_4:
mistral_executor:
- image: *mistral_executor_image
+ image: &mistral_executor_image
+ list_join:
+ - '/'
+ - [ {get_param: DockerNamespace}, {get_param: DockerMistralExecutorImage} ]
net: host
privileged: false
restart: always