From f1dbf2579748d073718b7b38a76f884d5b2c8361 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Thu, 13 Aug 2015 15:55:13 -0700 Subject: WIP: Remove data containers and adjust compose files Remove all data containers from the repository except the one image we intend to reuse for each data container. Adjust compose files to remove all references to the unique data containers which serve no purpose other then to take up extra resources. Needs VOLUME in data containers exported in the compose files. Change-Id: Id7746110946ef9836180cf57302aaf827e7e5405 Partially-Implements: blueprint one-data-container --- docker_templates/cinder/cinder-data/Dockerfile.j2 | 9 --------- docker_templates/cinder/cinder-data/build | 1 - .../designate/designate-backend-bind9-data/Dockerfile.j2 | 6 ------ docker_templates/swift/swift-data/Dockerfile.j2 | 13 ------------- 4 files changed, 29 deletions(-) delete mode 100644 docker_templates/cinder/cinder-data/Dockerfile.j2 delete mode 120000 docker_templates/cinder/cinder-data/build delete mode 100644 docker_templates/designate/designate-backend-bind9-data/Dockerfile.j2 delete mode 100644 docker_templates/swift/swift-data/Dockerfile.j2 (limited to 'docker_templates') diff --git a/docker_templates/cinder/cinder-data/Dockerfile.j2 b/docker_templates/cinder/cinder-data/Dockerfile.j2 deleted file mode 100644 index fd45dd31d..000000000 --- a/docker_templates/cinder/cinder-data/Dockerfile.j2 +++ /dev/null @@ -1,9 +0,0 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-cinder-base:{{ tag }} -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN mkdir -p /opt/data -VOLUME [ "/opt/data" ] - -# Command needed to start the data container. -# Note: data containers do not need to be persistent. -CMD ["/bin/true"] diff --git a/docker_templates/cinder/cinder-data/build b/docker_templates/cinder/cinder-data/build deleted file mode 120000 index 43944faa0..000000000 --- a/docker_templates/cinder/cinder-data/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker_templates/designate/designate-backend-bind9-data/Dockerfile.j2 b/docker_templates/designate/designate-backend-bind9-data/Dockerfile.j2 deleted file mode 100644 index c34cd5954..000000000 --- a/docker_templates/designate/designate-backend-bind9-data/Dockerfile.j2 +++ /dev/null @@ -1,6 +0,0 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} -MAINTAINER Kolla Project (https://launchpad.net.kolla) - -VOLUME [ "/var/named" ] - -CMD [ "/bin/true" ] diff --git a/docker_templates/swift/swift-data/Dockerfile.j2 b/docker_templates/swift/swift-data/Dockerfile.j2 deleted file mode 100644 index 21bfc1d43..000000000 --- a/docker_templates/swift/swift-data/Dockerfile.j2 +++ /dev/null @@ -1,13 +0,0 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} -MAINTAINER Kolla Project (https://launchpad.net.kolla) - -# NOTE(pbourke): This is emulating the Swift "all-in-one" setups where there are 3 disks/partitions -# on which to mirror data. This is extremely inefficient and is really only to prove everything -# works in an AIO setup. For production deploys the Ansible provisioned setup should be used. -VOLUME [ "/srv/node/sdb1" ] -VOLUME [ "/srv/node/sdb2" ] -VOLUME [ "/srv/node/sdb3" ] - -# Command needed to start the data container. -# Note: data containers do not need to be persistent. -CMD ["/bin/true"] -- cgit v1.2.3