diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-25 08:46:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-25 08:46:27 +0000 |
| commit | eb05118a3ffd4e0e9fc622a82aa07eb27e7fd723 (patch) | |
| tree | 0af199fe9a980a83c66d1755c79255edebfa99d7 /docker_templates | |
| parent | 9911f75789dd424abe8f4f4926bec7c9d2fafcbe (diff) | |
| parent | f1dbf2579748d073718b7b38a76f884d5b2c8361 (diff) | |
| download | kolla-eb05118a3ffd4e0e9fc622a82aa07eb27e7fd723.tar.gz kolla-eb05118a3ffd4e0e9fc622a82aa07eb27e7fd723.zip | |
Merge "WIP: Remove data containers and adjust compose files"
Diffstat (limited to 'docker_templates')
4 files changed, 0 insertions, 29 deletions
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"] |