From bd5e5bbb64b20eb4c77c2a941973845d847e9d78 Mon Sep 17 00:00:00 2001 From: Steven Dake 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/common/galera/config-galera.sh | 9 ++------- docker/common/rabbitmq/config-rabbit.sh | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'docker/common') 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