summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-03-21 02:47:52 +0000
committerGerrit Code Review <review@openstack.org>2015-03-21 02:47:52 +0000
commit17eccb0dfd4e39f90f5b0bd5fd608525524422f3 (patch)
tree28b98c36b11e725683383e0fa70f383fe1720535 /tools
parent3f4c45fac55690e62d0ecfa4bdf47ee59912459b (diff)
parent5547b5fe786b7491d2e33f92c4082535f2bb56cf (diff)
downloadkolla-17eccb0dfd4e39f90f5b0bd5fd608525524422f3.tar.gz
kolla-17eccb0dfd4e39f90f5b0bd5fd608525524422f3.zip
Merge "Implements: blueprint Implement a database container set"
Diffstat (limited to 'tools')
-rwxr-xr-xtools/genenv6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/genenv b/tools/genenv
index cd2a3bd00..7160420c7 100755
--- a/tools/genenv
+++ b/tools/genenv
@@ -24,7 +24,7 @@ ADMIN_USER_PASSWORD=steakfordinner
# Database
HOST_IP=$MY_IP
-MYSQL_ROOT_PASSWORD=kolla
+MARIADB_ROOT_PASSWORD=kolla
PASSWORD=12345
# Host
@@ -76,7 +76,7 @@ cat > ./compose/openstack.env <<EOF
ADMIN_USER_PASSWORD=$ADMIN_USER_PASSWORD
ADMIN_TENANT_NAME=$ADMIN_TENANT_NAME
CONFIG_NETWORK=$CONFIG_NETWORK
-DB_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD
+DB_ROOT_PASSWORD=$MARIADB_ROOT_PASSWORD
FLAT_INTERFACE=$NOVA_FLAT_INTERFACE
GLANCE_API_SERVICE_HOST=$GLANCE_API_SERVICE_HOST
GLANCE_DB_NAME=$GLANCE_DB_NAME
@@ -93,7 +93,7 @@ KEYSTONE_AUTH_PROTOCOL=$KEYSTONE_AUTH_PROTOCOL
KEYSTONE_DB_PASSWORD=$KEYSTONE_DB_PASSWORD
KEYSTONE_PUBLIC_SERVICE_HOST=$KEYSTONE_PUBLIC_SERVICE_HOST
MARIADB_SERVICE_HOST=$HOST_IP
-MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD
+MARIADB_ROOT_PASSWORD=$MARIADB_ROOT_PASSWORD
NETWORK_MANAGER=nova
NOVA_API_SERVICE_HOST=$NOVA_API_SERVICE_HOST
NOVA_DB_NAME=$NOVA_DB_NAME