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

33 files changed, 11 insertions, 134 deletions

diff --git a/compose/cinder-volume.yml b/compose/cinder-volume.yml
index a1d601acf..005e19ed7 100644
--- a/compose/cinder-volume.yml
+++ b/compose/cinder-volume.yml
@@ -1,5 +1,5 @@
 cinderdata:
-  image: kollaglue/centos-rdo-cinder-data:latest
+  image: kollaglue/centos-rdo-data:latest
   name: cinderdata
   restart: on-failure
 
diff --git a/compose/designate.yml b/compose/designate.yml
index 05ae7b53b..94b432bfa 100644
--- a/compose/designate.yml
+++ b/compose/designate.yml
@@ -28,7 +28,7 @@ designatepoolmanager:
 
 # Bind9 backend and state storage.
 designatebackendbind9data:
-  image: kollaglue/centos-rdo-designate-backend-bind9-data:latest
+  image: kollaglue/centos-rdo-data:latest
   name: designate-backend-bind9-data
   restart: on-failure
 
diff --git a/compose/galeradb.yml b/compose/galeradb.yml
index 2a40e37e7..740625524 100644
--- a/compose/galeradb.yml
+++ b/compose/galeradb.yml
@@ -1,5 +1,5 @@
 galeradbdata:
-  image: kollaglue/centos-rdo-mariadb-data:latest
+  image: kollaglue/centos-rdo-data:latest
   name: galeradb-data
   restart: on-failure
 
@@ -12,4 +12,4 @@ galeraapp:
   env_file:
     - openstack.env
   volumes_from:
-    - galeradbdata
\ No newline at end of file
+    - galeradbdata
diff --git a/compose/glance-api-registry.yml b/compose/glance-api-registry.yml
index 130020cd6..316e0ad4e 100644
--- a/compose/glance-api-registry.yml
+++ b/compose/glance-api-registry.yml
@@ -9,6 +9,8 @@ glanceregistry:
   restart: always
   env_file:
    - openstack.env
+  volumes_from:
+   - glancedata
 
 glanceapi:
   image: kollaglue/centos-rdo-glance-api:latest
diff --git a/compose/mariadb.yml b/compose/mariadb.yml
index 0736784f9..f20e8d718 100644
--- a/compose/mariadb.yml
+++ b/compose/mariadb.yml
@@ -1,5 +1,5 @@
 mariadbdata:
-  image: kollaglue/centos-rdo-mariadb-data:latest
+  image: kollaglue/centos-rdo-data:latest
   name: mariadbdata
   restart: on-failure
 
diff --git a/compose/nova-api-compute-network.yml b/compose/nova-api-compute-network.yml
index e1f9d515f..6071d5bcd 100644
--- a/compose/nova-api-compute-network.yml
+++ b/compose/nova-api-compute-network.yml
@@ -1,5 +1,5 @@
 computedata:
-   image: kollaglue/centos-rdo-nova-compute-data:latest
+   image: kollaglue/centos-rdo-data:latest
    name: computedata
 
 libvirt:
diff --git a/compose/nova-compute-network.yml b/compose/nova-compute-network.yml
index 7b8781e5f..106aa046e 100644
--- a/compose/nova-compute-network.yml
+++ b/compose/nova-compute-network.yml
@@ -1,5 +1,5 @@
 computedata:
-   image: kollaglue/centos-rdo-nova-compute-data:latest
+   image: kollaglue/centos-rdo-data:latest
    name: computedata
 
 libvirt:
diff --git a/compose/nova-compute.yml b/compose/nova-compute.yml
index 297b5cf10..d75752618 100644
--- a/compose/nova-compute.yml
+++ b/compose/nova-compute.yml
@@ -1,5 +1,5 @@
 computedata:
-   image: kollaglue/centos-rdo-nova-compute-data:latest
+   image: kollaglue/centos-rdo-data:latest
    name: computedata
 
 libvirt:
diff --git a/compose/swift-storage.yml b/compose/swift-storage.yml
index e790a5e71..35bebd69e 100644
--- a/compose/swift-storage.yml
+++ b/compose/swift-storage.yml
@@ -1,5 +1,5 @@
 swiftdata:
-   image: kollaglue/centos-rdo-swift-data:latest
+   image: kollaglue/centos-rdo-data:latest
    name: swiftdata
 
 swiftobjectserver:
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
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"]