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 | |
| 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')
20 files changed, 0 insertions, 96 deletions
diff --git a/docker/centos/binary/cinder/cinder-data/Dockerfile b/docker/centos/binary/cinder/cinder-data/Dockerfile deleted file mode 100644 index 117e74da1..000000000 --- a/docker/centos/binary/cinder/cinder-data/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_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/centos/binary/cinder/cinder-data/build b/docker/centos/binary/cinder/cinder-data/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/cinder/cinder-data/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/designate/designate-backend-bind9-data/Dockerfile b/docker/centos/binary/designate/designate-backend-bind9-data/Dockerfile deleted file mode 100644 index 99909c361..000000000 --- a/docker/centos/binary/designate/designate-backend-bind9-data/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -VOLUME [ "/var/named" ] - -CMD [ "/bin/true" ] diff --git a/docker/centos/binary/designate/designate-backend-bind9-data/build b/docker/centos/binary/designate/designate-backend-bind9-data/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/designate/designate-backend-bind9-data/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/glance/glance-data/Dockerfile b/docker/centos/binary/glance/glance-data/Dockerfile deleted file mode 100644 index e99c60eca..000000000 --- a/docker/centos/binary/glance/glance-data/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -VOLUME [ "/var/lib/glance" ] -CMD ["/bin/true"] diff --git a/docker/centos/binary/glance/glance-data/build b/docker/centos/binary/glance/glance-data/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/glance/glance-data/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/nova/nova-compute-data/Dockerfile b/docker/centos/binary/nova/nova-compute-data/Dockerfile deleted file mode 100644 index 0af407095..000000000 --- a/docker/centos/binary/nova/nova-compute-data/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -VOLUME [ "/var/lib/nova" ] -VOLUME [ "/var/lib/libvirt" ] -VOLUME [ "/etc/libvirt/qemu" ] - -# Command needed to start the data container. -# Note: data containers do not need to be persistent. -CMD ["/bin/true"] diff --git a/docker/centos/binary/nova/nova-compute-data/build b/docker/centos/binary/nova/nova-compute-data/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/nova/nova-compute-data/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-data/Dockerfile b/docker/centos/binary/swift/swift-data/Dockerfile deleted file mode 100644 index ab675045c..000000000 --- a/docker/centos/binary/swift/swift-data/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_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"] diff --git a/docker/centos/binary/swift/swift-data/build b/docker/centos/binary/swift/swift-data/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/swift/swift-data/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/cinder/cinder-data/Dockerfile b/docker/centos/source/cinder/cinder-data/Dockerfile deleted file mode 100644 index 117e74da1..000000000 --- a/docker/centos/source/cinder/cinder-data/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_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/centos/source/cinder/cinder-data/build b/docker/centos/source/cinder/cinder-data/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/cinder/cinder-data/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/designate/designate-backend-bind9-data/Dockerfile b/docker/centos/source/designate/designate-backend-bind9-data/Dockerfile deleted file mode 100644 index 99909c361..000000000 --- a/docker/centos/source/designate/designate-backend-bind9-data/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -VOLUME [ "/var/named" ] - -CMD [ "/bin/true" ] diff --git a/docker/centos/source/designate/designate-backend-bind9-data/build b/docker/centos/source/designate/designate-backend-bind9-data/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/designate/designate-backend-bind9-data/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/glance/glance-data/Dockerfile b/docker/centos/source/glance/glance-data/Dockerfile deleted file mode 100644 index e99c60eca..000000000 --- a/docker/centos/source/glance/glance-data/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -VOLUME [ "/var/lib/glance" ] -CMD ["/bin/true"] diff --git a/docker/centos/source/glance/glance-data/build b/docker/centos/source/glance/glance-data/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/glance/glance-data/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/nova/nova-compute-data/Dockerfile b/docker/centos/source/nova/nova-compute-data/Dockerfile deleted file mode 100644 index 0af407095..000000000 --- a/docker/centos/source/nova/nova-compute-data/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -VOLUME [ "/var/lib/nova" ] -VOLUME [ "/var/lib/libvirt" ] -VOLUME [ "/etc/libvirt/qemu" ] - -# Command needed to start the data container. -# Note: data containers do not need to be persistent. -CMD ["/bin/true"] diff --git a/docker/centos/source/nova/nova-compute-data/build b/docker/centos/source/nova/nova-compute-data/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/nova/nova-compute-data/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-data/Dockerfile b/docker/centos/source/swift/swift-data/Dockerfile deleted file mode 100644 index ab675045c..000000000 --- a/docker/centos/source/swift/swift-data/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_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"] diff --git a/docker/centos/source/swift/swift-data/build b/docker/centos/source/swift/swift-data/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/swift/swift-data/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file |