From f1dbf2579748d073718b7b38a76f884d5b2c8361 Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Thu, 13 Aug 2015 15:55:13 -0700
Subject: [PATCH] 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
---
compose/cinder-volume.yml | 2 +-
compose/designate.yml | 2 +-
compose/galeradb.yml | 4 ++--
compose/glance-api-registry.yml | 2 ++
compose/mariadb.yml | 2 +-
compose/nova-api-compute-network.yml | 2 +-
compose/nova-compute-network.yml | 2 +-
compose/nova-compute.yml | 2 +-
compose/swift-storage.yml | 2 +-
docker/centos/binary/cinder/cinder-data/Dockerfile | 9 ---------
docker/centos/binary/cinder/cinder-data/build | 1 -
.../designate-backend-bind9-data/Dockerfile | 6 ------
.../designate/designate-backend-bind9-data/build | 1 -
docker/centos/binary/glance/glance-data/Dockerfile | 5 -----
docker/centos/binary/glance/glance-data/build | 1 -
.../centos/binary/nova/nova-compute-data/Dockerfile | 10 ----------
docker/centos/binary/nova/nova-compute-data/build | 1 -
docker/centos/binary/swift/swift-data/Dockerfile | 13 -------------
docker/centos/binary/swift/swift-data/build | 1 -
docker/centos/source/cinder/cinder-data/Dockerfile | 9 ---------
docker/centos/source/cinder/cinder-data/build | 1 -
.../designate-backend-bind9-data/Dockerfile | 6 ------
.../designate/designate-backend-bind9-data/build | 1 -
docker/centos/source/glance/glance-data/Dockerfile | 5 -----
docker/centos/source/glance/glance-data/build | 1 -
.../centos/source/nova/nova-compute-data/Dockerfile | 10 ----------
docker/centos/source/nova/nova-compute-data/build | 1 -
docker/centos/source/swift/swift-data/Dockerfile | 13 -------------
docker/centos/source/swift/swift-data/build | 1 -
docker_templates/cinder/cinder-data/Dockerfile.j2 | 9 ---------
docker_templates/cinder/cinder-data/build | 1 -
.../designate-backend-bind9-data/Dockerfile.j2 | 6 ------
docker_templates/swift/swift-data/Dockerfile.j2 | 13 -------------
33 files changed, 11 insertions(+), 134 deletions(-)
delete mode 100644 docker/centos/binary/cinder/cinder-data/Dockerfile
delete mode 120000 docker/centos/binary/cinder/cinder-data/build
delete mode 100644 docker/centos/binary/designate/designate-backend-bind9-data/Dockerfile
delete mode 120000 docker/centos/binary/designate/designate-backend-bind9-data/build
delete mode 100644 docker/centos/binary/glance/glance-data/Dockerfile
delete mode 120000 docker/centos/binary/glance/glance-data/build
delete mode 100644 docker/centos/binary/nova/nova-compute-data/Dockerfile
delete mode 120000 docker/centos/binary/nova/nova-compute-data/build
delete mode 100644 docker/centos/binary/swift/swift-data/Dockerfile
delete mode 120000 docker/centos/binary/swift/swift-data/build
delete mode 100644 docker/centos/source/cinder/cinder-data/Dockerfile
delete mode 120000 docker/centos/source/cinder/cinder-data/build
delete mode 100644 docker/centos/source/designate/designate-backend-bind9-data/Dockerfile
delete mode 120000 docker/centos/source/designate/designate-backend-bind9-data/build
delete mode 100644 docker/centos/source/glance/glance-data/Dockerfile
delete mode 120000 docker/centos/source/glance/glance-data/build
delete mode 100644 docker/centos/source/nova/nova-compute-data/Dockerfile
delete mode 120000 docker/centos/source/nova/nova-compute-data/build
delete mode 100644 docker/centos/source/swift/swift-data/Dockerfile
delete mode 120000 docker/centos/source/swift/swift-data/build
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
diff --git a/compose/cinder-volume.yml b/compose/cinder-volume.yml
index a1d601acf7..005e19ed74 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 05ae7b53ba..94b432bfaa 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 2a40e37e7c..740625524f 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 130020cd6c..316e0ad4e8 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 0736784f96..f20e8d7189 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 e1f9d515f0..6071d5bcd2 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 7b8781e5fe..106aa046ed 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 297b5cf103..d757526189 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 e790a5e718..35bebd69ed 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 117e74da1f..0000000000
--- 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 ec19138031..0000000000
--- 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 99909c361a..0000000000
--- 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 ec19138031..0000000000
--- 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 e99c60ecaf..0000000000
--- 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 ec19138031..0000000000
--- 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 0af407095b..0000000000
--- 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 ec19138031..0000000000
--- 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 ab675045c8..0000000000
--- 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 ec19138031..0000000000
--- 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 117e74da1f..0000000000
--- 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 ec19138031..0000000000
--- 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 99909c361a..0000000000
--- 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 ec19138031..0000000000
--- 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 e99c60ecaf..0000000000
--- 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 ec19138031..0000000000
--- 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 0af407095b..0000000000
--- 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 ec19138031..0000000000
--- 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 ab675045c8..0000000000
--- 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 ec19138031..0000000000
--- 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 fd45dd31d3..0000000000
--- 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 43944faa00..0000000000
--- 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 c34cd5954d..0000000000
--- 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 21bfc1d435..0000000000
--- 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"]