From 5547b5fe786b7491d2e33f92c4082535f2bb56cf Mon Sep 17 00:00:00 2001
From: Daneyon Hansen <danehans@cisco.com>
Date: Wed, 25 Feb 2015 05:49:40 +0000
Subject: Implements: blueprint Implement a database container set

Previously, the database container was configured for use with
Kubernetes. This patch removed any k8s dependencies, adds a script
to manage mysql server.cnf settings and splits data and app
containers. Splitting the containers provides additional
portability and operational efficiencies compared to host mounts.

Change-Id: I80656450c02dda5f2959d187eec20d5877dc54a2
---
 tools/genenv | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tools/genenv')

diff --git a/tools/genenv b/tools/genenv
index 91ac42cc4..c2e59e820 100755
--- a/tools/genenv
+++ b/tools/genenv
@@ -21,7 +21,7 @@ echo MY_DEV=$MY_DEV
 
 # Database
 HOST_IP=$MY_IP
-MYSQL_ROOT_PASSWORD=kolla
+MARIADB_ROOT_PASSWORD=kolla
 PASSWORD=12345
 
 # Host
@@ -72,7 +72,7 @@ EOF
 cat > ./compose/openstack.env <<EOF
 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
@@ -89,7 +89,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
-- 
cgit v1.2.3