From cb4e875ae1e1ec2e6ddf8a6b37f42283697fd50c Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Wed, 30 Sep 2015 11:23:39 +0000
Subject: Common start.sh

The majority of the start.sh code is identical. This removes that
duplicate code while still maintaining the ability to call code in a
specific container.

The start.sh is moved into /usr/local/bin/kolla_start in the container

The extend_start.sh script is called by the kolla_start script at the
location /usr/local/bin/kolla_extend_start . It always exists because
we create a noop kolla_extend_start in the base directory. We override
it with extend_start.sh in a specific image should we need to.

Of note, the neutron-agents container is exempt from this new
structure due to it being a fat container.

Additionally, we fix the inconsistent permissions throughout. 644 for
repo files and the scripts are set to 755 via a Docker RUN command to
ensure someones local perm change won't break upstream containers.

Change-Id: I7da8d19965463ad30ee522a71183e3f092e0d6ad
Closes-Bug: #1501295
---
 docker/mariadb/Dockerfile.j2    |  6 ++----
 docker/mariadb/config-galera.sh | 36 -----------------------------------
 docker/mariadb/extend_start.sh  | 42 +++++++++++++++++++++++++++++++++++++++++
 docker/mariadb/start.sh         | 20 --------------------
 4 files changed, 44 insertions(+), 60 deletions(-)
 delete mode 100755 docker/mariadb/config-galera.sh
 create mode 100644 docker/mariadb/extend_start.sh
 delete mode 100755 docker/mariadb/start.sh

(limited to 'docker/mariadb')

diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2
index 1cfae7798..fbc699290 100644
--- a/docker/mariadb/Dockerfile.j2
+++ b/docker/mariadb/Dockerfile.j2
@@ -28,9 +28,7 @@ RUN apt-get install -y --no-install-recommends \
 
 {% endif %}
 
-COPY config-galera.sh /opt/kolla/config/
-COPY start.sh /
-
-CMD ["/start.sh"]
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+RUN chmod 755 /usr/local/bin/kolla_extend_start
 
 {{ include_footer }}
diff --git a/docker/mariadb/config-galera.sh b/docker/mariadb/config-galera.sh
deleted file mode 100755
index cfdd7d9a2..000000000
--- a/docker/mariadb/config-galera.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-function bootstrap_db {
-    mysqld_safe --wsrep-new-cluster &
-
-    # Waiting for deamon
-    sleep 10
-    expect -c '
-    set timeout 10
-    spawn mysql_secure_installation
-    expect "Enter current password for root (enter for none):"
-    send "\r"
-    expect "Set root password?"
-    send "y\r"
-    expect "New password:"
-    send "'"${DB_ROOT_PASSWORD}"'\r"
-    expect "Re-enter new password:"
-    send "'"${DB_ROOT_PASSWORD}"'\r"
-    expect "Remove anonymous users?"
-    send "y\r"
-    expect "Disallow root login remotely?"
-    send "n\r"
-    expect "Remove test database and access to it?"
-    send "y\r"
-    expect "Reload privilege tables now?"
-    send "y\r"
-    expect eof'
-
-    mysql -u root --password="${DB_ROOT_PASSWORD}" -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' IDENTIFIED BY '${DB_ROOT_PASSWORD}' WITH GRANT OPTION;"
-    mysql -u root --password="${DB_ROOT_PASSWORD}" -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY '${DB_ROOT_PASSWORD}' WITH GRANT OPTION;"
-    mysqladmin -p"${DB_ROOT_PASSWORD}" shutdown
-}
-
-function populate_db {
-    mysql_install_db --user=mysql
-}
diff --git a/docker/mariadb/extend_start.sh b/docker/mariadb/extend_start.sh
new file mode 100644
index 000000000..6fa450675
--- /dev/null
+++ b/docker/mariadb/extend_start.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+function bootstrap_db {
+    mysqld_safe --wsrep-new-cluster &
+
+    # Waiting for deamon
+    sleep 10
+    expect -c '
+    set timeout 10
+    spawn mysql_secure_installation
+    expect "Enter current password for root (enter for none):"
+    send "\r"
+    expect "Set root password?"
+    send "y\r"
+    expect "New password:"
+    send "'"${DB_ROOT_PASSWORD}"'\r"
+    expect "Re-enter new password:"
+    send "'"${DB_ROOT_PASSWORD}"'\r"
+    expect "Remove anonymous users?"
+    send "y\r"
+    expect "Disallow root login remotely?"
+    send "n\r"
+    expect "Remove test database and access to it?"
+    send "y\r"
+    expect "Reload privilege tables now?"
+    send "y\r"
+    expect eof'
+
+    mysql -u root --password="${DB_ROOT_PASSWORD}" -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' IDENTIFIED BY '${DB_ROOT_PASSWORD}' WITH GRANT OPTION;"
+    mysql -u root --password="${DB_ROOT_PASSWORD}" -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY '${DB_ROOT_PASSWORD}' WITH GRANT OPTION;"
+    mysqladmin -p"${DB_ROOT_PASSWORD}" shutdown
+}
+
+chown mysql: /var/lib/mysql
+
+# This catches all cases of the BOOTSTRAP variable being set, including empty
+if [[ "${!KOLLA_BOOTSTRAP[@]}" ]] && [[ ! -e /var/lib/mysql/cluster.exists ]]; then
+    ARGS="--wsrep-new-cluster"
+    touch /var/lib/mysql/cluster.exists
+    mysql_install_db --user=mysql
+    bootstrap_db
+fi
diff --git a/docker/mariadb/start.sh b/docker/mariadb/start.sh
deleted file mode 100755
index 6d80153f0..000000000
--- a/docker/mariadb/start.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-# Loading common functions
-source /opt/kolla/kolla-common.sh
-source /opt/kolla/config/config-galera.sh
-
-chown mysql: /var/lib/mysql
-
-# This catches all cases of the BOOTSTRAP variable being set, including empty
-if [[ "${!KOLLA_BOOTSTRAP[@]}" ]] && [[ ! -e /var/lib/mysql/cluster.exists ]]; then
-    ARGS="--wsrep-new-cluster"
-    touch /var/lib/mysql/cluster.exists
-    populate_db
-    bootstrap_db
-    exec $CMD $ARGS
-    exit 0
-fi
-
-exec $CMD
-- 
cgit v1.2.3