From bd5e5bbb64b20eb4c77c2a941973845d847e9d78 Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Thu, 13 Aug 2015 14:26:55 -0700
Subject: Use one data container for all data volumes

The previous method of using the API image for a data container
worked, but resulted in more data being bindmounted and copied
into the system.  This patch resolves that by essentially using
a distro-type as a FROM in a Dockerfile to generate
distro-type-data.  Further all of the data containers used
throughout ansible are modified to use this new data container.

Change-Id: I8846573d4f2d4b98d4f46c770bfefc6d4c5cd0b5
Partially-Implements: blueprint one-data-container
---
 docker/centos/binary/data/Dockerfile     | 4 ++++
 docker/centos/binary/data/build          | 1 +
 docker/centos/binary/galera/Dockerfile   | 3 ++-
 docker/centos/binary/rabbitmq/Dockerfile | 3 ++-
 docker/centos/source/data/Dockerfile     | 4 ++++
 docker/centos/source/data/build          | 1 +
 docker/common/galera/config-galera.sh    | 9 ++-------
 docker/common/rabbitmq/config-rabbit.sh  | 2 +-
 8 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 docker/centos/binary/data/Dockerfile
 create mode 120000 docker/centos/binary/data/build
 create mode 100644 docker/centos/source/data/Dockerfile
 create mode 120000 docker/centos/source/data/build

(limited to 'docker')

diff --git a/docker/centos/binary/data/Dockerfile b/docker/centos/binary/data/Dockerfile
new file mode 100644
index 000000000..635918540
--- /dev/null
+++ b/docker/centos/binary/data/Dockerfile
@@ -0,0 +1,4 @@
+FROM centos
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+CMD /bin/sleep infinity
diff --git a/docker/centos/binary/data/build b/docker/centos/binary/data/build
new file mode 120000
index 000000000..8d652f7ee
--- /dev/null
+++ b/docker/centos/binary/data/build
@@ -0,0 +1 @@
+../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/galera/Dockerfile b/docker/centos/binary/galera/Dockerfile
index e4171165b..9a21c3440 100644
--- a/docker/centos/binary/galera/Dockerfile
+++ b/docker/centos/binary/galera/Dockerfile
@@ -19,7 +19,8 @@ RUN echo "[mariadb]" > /etc/yum.repos.d/MariaDB.repo && \
       percona-xtrabackup \
       pv \
       tar \
-      expect
+      expect \
+    && rm -rf /var/lib/mysql/*
 
 COPY config-galera.sh /opt/kolla/config/
 COPY config-external.sh /opt/kolla/
diff --git a/docker/centos/binary/rabbitmq/Dockerfile b/docker/centos/binary/rabbitmq/Dockerfile
index 51197ca43..88894c3c7 100644
--- a/docker/centos/binary/rabbitmq/Dockerfile
+++ b/docker/centos/binary/rabbitmq/Dockerfile
@@ -5,7 +5,8 @@ RUN yum -y install \
    hostname \
    rabbitmq-server && \
    yum clean all && \
-   /usr/lib/rabbitmq/bin/rabbitmq-plugins enable rabbitmq_management
+   /usr/lib/rabbitmq/bin/rabbitmq-plugins enable rabbitmq_management \
+ && rm -rf /var/lib/rabbitmq/*
 
 COPY config-rabbit.sh config-external.sh /opt/kolla/
 COPY start.sh /
diff --git a/docker/centos/source/data/Dockerfile b/docker/centos/source/data/Dockerfile
new file mode 100644
index 000000000..635918540
--- /dev/null
+++ b/docker/centos/source/data/Dockerfile
@@ -0,0 +1,4 @@
+FROM centos
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+CMD /bin/sleep infinity
diff --git a/docker/centos/source/data/build b/docker/centos/source/data/build
new file mode 120000
index 000000000..8d652f7ee
--- /dev/null
+++ b/docker/centos/source/data/build
@@ -0,0 +1 @@
+../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/common/galera/config-galera.sh b/docker/common/galera/config-galera.sh
index 8aab3cfe1..42393377d 100755
--- a/docker/common/galera/config-galera.sh
+++ b/docker/common/galera/config-galera.sh
@@ -74,13 +74,8 @@ function configure_db {
 }
 
 function populate_db {
-    if [[ $(ls /var/lib/mysql) == "" ]]; then
-        echo "POPULATING NEW DB"
-        mysql_install_db
-        chown -R mysql: /var/lib/mysql
-    else
-        echo "DB ALREADY EXISTS"
-    fi
+    mysql_install_db
+    chown -R mysql: /var/lib/mysql
 }
 
 function prepare_db {
diff --git a/docker/common/rabbitmq/config-rabbit.sh b/docker/common/rabbitmq/config-rabbit.sh
index 6f2283c67..c87a2ab48 100644
--- a/docker/common/rabbitmq/config-rabbit.sh
+++ b/docker/common/rabbitmq/config-rabbit.sh
@@ -2,6 +2,6 @@
 
 function set_rabbitmq_cookie {
     echo "${RABBITMQ_CLUSTER_COOKIE}" > /var/lib/rabbitmq/.erlang.cookie
-    chown rabbitmq: /var/lib/rabbitmq/.erlang.cookie
+    chown -R rabbitmq: /var/lib/rabbitmq
     chmod 400 /var/lib/rabbitmq/.erlang.cookie
 }
-- 
cgit v1.2.3