openstack/kolla-ansible
Code Issues Proposed changes

use renamed mariadb services

Browse Source 
This patch updates all the json files that reference the mariadb service
variables to ues the new names.

Labelling things foo-master crept into this repository from the
kubernetes guestbook example (which has redis-master and redis-slaves).
We're not running clustered software at the moment so these labels are
unnecessary.

Change-Id: I229d04c89aa13cb6cc2e1c33a0a7b21e1c6e9caa
This commit is contained in:
Lars Kellogg-Stedman 2014-10-05 16:12:44 -04:00
parent 296b09e0c4
commit 068face6fa
9 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/cinder/start.sh
View File

@ -21,7 +21,7 @@ if ! [ "$CINDER_DB_PASSWORD" ]; then
export CINDER_DB_PASSWORD
fi
mysql -h ${MARIADBMASTER_PORT_3306_TCP_ADDR} -u root \
mysql -h ${MARIADB_PORT_3306_TCP_ADDR} -u root \
-p${DB_ROOT_PASSWORD} mysql <<EOF
EOF
CREATE DATABASE IF NOT EXISTS ${CINDER_DB_NAME};

2
docker/glance/glance-base/config-glance.sh
View File

@ -50,5 +50,5 @@ crudini --set $cfg
crudini --set $cfg \
database \
connection \
"mysql://${GLANCE_DB_USER}:${GLANCE_DB_PASSWORD}@${MARIADBMASTER_PORT_3306_TCP_ADDR}:${MARIADBMASTER_PORT_3306_TCP_PORT}/${GLANCE_DB_NAME}"
"mysql://${GLANCE_DB_USER}:${GLANCE_DB_PASSWORD}@${MARIADB_PORT_3306_TCP_ADDR}:${MARIADB_PORT_3306_TCP_PORT}/${GLANCE_DB_NAME}"

2
docker/glance/glance-registry/start.sh
View File

@ -23,7 +23,7 @@ fi
sh /opt/glance/config-glance.sh registry
mysql -h ${MARIADBMASTER_PORT_3306_TCP_ADDR} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF
mysql -h ${MARIADB_PORT_3306_TCP_ADDR} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF
CREATE DATABASE IF NOT EXISTS ${GLANCE_DB_NAME} DEFAULT CHARACTER SET utf8;
GRANT ALL PRIVILEGES ON ${GLANCE_DB_NAME}.* TO
'${GLANCE_DB_USER}'@'%' IDENTIFIED BY '${GLANCE_DB_PASSWORD}'

2
docker/heat/heat-engine/start.sh
View File

@ -23,7 +23,7 @@ fi
sh /opt/heat/config-heat.sh engine
mysql -h ${MARIADBMASTER_PORT_3306_TCP_ADDR} -u root \
mysql -h ${MARIADB_PORT_3306_TCP_ADDR} -u root \
-p${DB_ROOT_PASSWORD} mysql <<EOF
CREATE DATABASE IF NOT EXISTS ${GLANCE_DB_NAME};
GRANT ALL PRIVILEGES ON heat* TO

6
docker/keystone/start.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
# Exit the container if MariaDB is not yet up - then depend on kube to restart
if [ -z "$MARIADBMASTER_PORT_3306_TCP_PORT" ]; then
if [ -z "$MARIADB_PORT_3306_TCP_PORT" ]; then
exit 1
fi
@ -16,7 +16,7 @@ if ! [ "$KEYSTONE_DB_PASSWORD" ]; then
KEYSTONE_DB_PASSWORD=$(openssl rand -hex 15)
fi
mysql -h ${MARIADBMASTER_PORT_3306_TCP_ADDR} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF
mysql -h ${MARIADB_PORT_3306_TCP_ADDR} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF
CREATE DATABASE IF NOT EXISTS keystone;
GRANT ALL PRIVILEGES ON keystone.* TO
'keystone'@'%' IDENTIFIED BY '${KEYSTONE_DB_PASSWORD}'
@ -25,7 +25,7 @@ EOF
crudini --set /etc/keystone/keystone.conf \
database \
connection \
"mysql://keystone:${KEYSTONE_DB_PASSWORD}@${MARIADBMASTER_PORT_3306_TCP_ADDR}:${MARIADBMASTER_PORT_3306_TCP_PORT}/keystone"
"mysql://keystone:${KEYSTONE_DB_PASSWORD}@${MARIADB_PORT_3306_TCP_ADDR}:${MARIADB_PORT_3306_TCP_PORT}/keystone"
crudini --set /etc/keystone/keystone.conf \
DEFAULT \
admin_token \

2
docker/nova-compute/nova-compute/start.sh
View File

@ -23,7 +23,7 @@ fi
sh /opt/nova/config-nova.sh compute
mysql -h ${MARIADBMASTER_PORT_3306_TCP_ADDR} -u root \
mysql -h ${MARIADB_PORT_3306_TCP_ADDR} -u root \
-p${DB_ROOT_PASSWORD} mysql <<EOF
CREATE DATABASE IF NOT EXISTS ${NOVA_DB_NAME};
GRANT ALL PRIVILEGES ON nova* TO

2
docker/swift/swift-account/start.sh
View File

@ -23,7 +23,7 @@ fi
sh /opt/swift/config-swift.sh account-server
mysql -h ${MARIADBMASTER_PORT_3306_TCP_ADDR} -u root \
mysql -h ${MARIADB_PORT_3306_TCP_ADDR} -u root \
-p${DB_ROOT_PASSWORD} mysql <<EOF
CREATE DATABASE IF NOT EXISTS ${SWIFT_DB_NAME};
GRANT ALL PRIVILEGES ON swift* TO

2
docker/swift/swift-container/start.sh
View File

@ -23,7 +23,7 @@ fi
sh /opt/swift/config-swift.sh container
mysql -h ${MARIADBMASTER_PORT_3306_TCP_ADDR} -u root \
mysql -h ${MARIADB_PORT_3306_TCP_ADDR} -u root \
-p${DB_ROOT_PASSWORD} mysql <<EOF
CREATE DATABASE IF NOT EXISTS ${SWIFT_DB_NAME};
GRANT ALL PRIVILEGES ON swift* TO

2
docker/swift/swift-object/start.sh
View File

@ -23,7 +23,7 @@ fi
sh /opt/swift/config-swift.sh engine
mysql -h ${MARIADBMASTER_PORT_3306_TCP_ADDR} -u root \
mysql -h ${MARIADB_PORT_3306_TCP_ADDR} -u root \
-p${DB_ROOT_PASSWORD} mysql <<EOF
CREATE DATABASE IF NOT EXISTS ${SWIFT_DB_NAME};
GRANT ALL PRIVILEGES ON swift* TO