aboutsummaryrefslogtreecommitdiff
path: root/docker/common
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-08-27 19:23:49 -0700
committerSteven Dake <stdake@cisco.com>2015-08-28 00:50:30 -0700
commitf895ee07cc5c1030e32854cf9a4e91bbeaf4de12 (patch)
treecc7d17c2c63bf83f6a983553b8729f67abeac58d /docker/common
parent5c82e0c90ce0fedf523b11b0b933f2276edf8f46 (diff)
downloadkolla-f895ee07cc5c1030e32854cf9a4e91bbeaf4de12.tar.gz
kolla-f895ee07cc5c1030e32854cf9a4e91bbeaf4de12.zip
Remove docker directory
Remove the docker directory (yay) and old build tools. This will result in an f21 failing gate - however, I have a patch submission to remove that gate from our project configuration. Change-Id: I3c461cedb6906422c8076f60c470e773d6cdcf33 Partially-Implements: blueprint remove-docker-dir
Diffstat (limited to 'docker/common')
-rwxr-xr-xdocker/common/mariadb-app/config-mysql.sh25
-rwxr-xr-xdocker/common/mariadb-app/mysql-entrypoint.sh49
2 files changed, 0 insertions, 74 deletions
diff --git a/docker/common/mariadb-app/config-mysql.sh b/docker/common/mariadb-app/config-mysql.sh
deleted file mode 100755
index 6cc6afa78..000000000
--- a/docker/common/mariadb-app/config-mysql.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-. /opt/kolla/kolla-common.sh
-
-: ${BIND_ADDRESS:=$PUBLIC_IP}
-: ${DB_ROOT_PASSWORD:=$DB_ROOT_PASSWORD}
-: ${DEFAULT_STORAGE_ENGINE:=innodb}
-: ${COLLATION_SERVER:=utf8_general_ci}
-: ${INIT_CONNECT:=SET NAMES utf8}
-: ${CHAR_SET_SERVER:=utf8}
-: ${INNODB_FILE_PER_TABLE:=true}
-: ${DATADIR:=/var/lib/mysql}
-: ${TEMP_FILE:='/tmp/mysql-first-time.sql'}
-
-server_cnf=/etc/my.cnf.d/server.cnf
-
-crudini --set $server_cnf mysqld bind-address $BIND_ADDRESS
-crudini --set $server_cnf mysqld default-storage-engine $DEFAULT_STORAGE_ENGINE
-crudini --set $server_cnf mysqld collation-server $COLLATION_SERVER
-crudini --set $server_cnf mysqld init-connect "'${INIT_CONNECT}'"
-crudini --set $server_cnf mysqld character-set-server $CHAR_SET_SERVER
-crudini --set $server_cnf mysqld max_connections "$MARIADB_MAX_CONNECTIONS"
-if [ "${INNODB_FILE_PER_TABLE}" == "true" ] || ["${INNODB_FILE_PER_TABLE}" == "True" ] ; then
- crudini --set $server_cnf mysqld innodb_file_per_table 1
-fi
diff --git a/docker/common/mariadb-app/mysql-entrypoint.sh b/docker/common/mariadb-app/mysql-entrypoint.sh
deleted file mode 100755
index 6dece43ca..000000000
--- a/docker/common/mariadb-app/mysql-entrypoint.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-set -e
-
-# Configure MySQL settings
-. /opt/kolla/config-mysql.sh
-
-if [ -z "$(ls -A /var/lib/mysql)" -a "${1%_safe}" = 'mysqld' ]; then
- PATH=/usr/libexec:$PATH
- export PATH
-
- if [ -z "$MARIADB_ROOT_PASSWORD" ]; then
- echo >&2 'error: database is uninitialized and MARIADB_ROOT_PASSWORD not set'
- echo >&2 ' Did you forget to add -e MARIADB_ROOT_PASSWORD=... ?'
- exit 1
- fi
-
- mysql_install_db --user=mysql --datadir="$DATADIR"
-
- # These statements _must_ be on individual lines, and _must_ end with
- # semicolons (no line breaks or comments are permitted).
- # TODO proper SQL escaping on ALL the things D:
- TEMP_FILE='/tmp/mysql-first-time.sql'
- cat > "$TEMP_FILE" <<-EOSQL
-DELETE FROM mysql.user ;
-CREATE USER 'root'@'%' IDENTIFIED BY '${MARIADB_ROOT_PASSWORD}' ;
-GRANT ALL ON *.* TO 'root'@'%' WITH GRANT OPTION ;
-DROP DATABASE IF EXISTS test ;
-EOSQL
-
- if [ "$MARIADB_DATABASE" ]; then
- echo "CREATE DATABASE IF NOT EXISTS $MARIADB_DATABASE ;" >> "$TEMP_FILE"
- fi
-
- if [ "$MARIADB_USER" -a "$MARIADB_PASSWORD" ]; then
- echo "CREATE USER '$MARIADB_USER'@'%' IDENTIFIED BY '$MARIADB_PASSWORD' ;" >> "$TEMP_FILE"
-
- if [ "$MARIADB_DATABASE" ]; then
- echo "GRANT ALL ON $MARIADB_DATABASE.* TO '$MARIADB_USER'@'%' ;" >> "$TEMP_FILE"
- fi
- fi
-
- echo 'FLUSH PRIVILEGES ;' >> "$TEMP_FILE"
-
- set -- "$@" --init-file="$TEMP_FILE"
-fi
-
-chown -R mysql:mysql "$DATADIR"
-
-exec "$@"