diff options
author | Dan Prince <dprince@redhat.com> | 2017-03-06 13:58:10 -0500 |
---|---|---|
committer | Martin André <m.andre@redhat.com> | 2017-03-10 08:35:57 +0100 |
commit | ab83e7731c78d44b05243d6242d026a97f4e170a (patch) | |
tree | 5ef4da6dae081398258ea8f27f6870f82e5dd6ce /docker/services/ironic-conductor.yaml | |
parent | 78b7a7ed8a6b9af70f300d98f1c7f1c4eb715629 (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/ironic-conductor.yaml')
-rw-r--r-- | docker/services/ironic-conductor.yaml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/docker/services/ironic-conductor.yaml b/docker/services/ironic-conductor.yaml index ff470008..8c18a160 100644 --- a/docker/services/ironic-conductor.yaml +++ b/docker/services/ironic-conductor.yaml @@ -59,10 +59,6 @@ outputs: get_attr: [IronicConductorBase, role_data, step_config] service_config_settings: {get_attr: [IronicConductorBase, role_data, service_config_settings]} # BEGIN DOCKER SETTINGS - docker_image: &ironic_image - list_join: - - '/' - - [ {get_param: DockerNamespace}, {get_param: DockerIronicConductorImage} ] puppet_config: config_volume: ironic puppet_tags: ironic_config @@ -89,7 +85,10 @@ outputs: docker_config: step_4: ironic-init-dirs: - image: *ironic_image + image: &ironic_image + list_join: + - '/' + - [ {get_param: DockerNamespace}, {get_param: DockerIronicConductorImage} ] user: root command: ['/bin/bash', '-c', 'mkdir /var/lib/ironic/httpboot && mkdir /var/lib/ironic/tftpboot'] volumes: |