aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/nova-placement.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/nova-placement.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/nova-placement.yaml')
-rw-r--r--docker/services/nova-placement.yaml9
1 files changed, 4 insertions, 5 deletions
diff --git a/docker/services/nova-placement.yaml b/docker/services/nova-placement.yaml
index 8da48d37..0f32e33f 100644
--- a/docker/services/nova-placement.yaml
+++ b/docker/services/nova-placement.yaml
@@ -49,10 +49,6 @@ outputs:
get_attr: [NovaPlacementBase, role_data, step_config]
service_config_settings: {get_attr: [NovaPlacementBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
- docker_image: &nova_placement_image
- list_join:
- - '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerNovaPlacementImage} ]
puppet_config:
config_volume: nova_placement
puppet_tags: nova_config
@@ -96,7 +92,10 @@ outputs:
step_3:
nova_placement:
start_order: 1
- image: *nova_placement_image
+ image:
+ list_join:
+ - '/'
+ - [ {get_param: DockerNamespace}, {get_param: DockerNovaPlacementImage} ]
net: host
user: root
restart: always