summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshuai chen <chenshuai@huawei.com>2015-12-02 01:20:43 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-12-02 01:20:44 +0000
commit3c48d787b3caa3a12153257abf66e3211109b8f5 (patch)
treee02ed53c2643223f0e5d327003e389004df5bf6e
parent59f12c1119da51446dcddc84c903e385645632e5 (diff)
parent2fda8cb972bd0789f358dad018a58a7fff00d3d8 (diff)
Merge "support configuration of heat db and service password when delpoyment"
-rw-r--r--deploy/conf/base.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/deploy/conf/base.conf b/deploy/conf/base.conf
index 131cd57d..3f8361fe 100644
--- a/deploy/conf/base.conf
+++ b/deploy/conf/base.conf
@@ -59,6 +59,6 @@ export GATEWAY="10.1.0.1"
export SERVER_CREDENTIAL="root=root"
export LOCAL_REPO_URL=""
export OS_CONFIG_FILENAME=""
-export SERVICE_CREDENTIALS="image:service=service,compute:service=service,dashboard:service=service,identity:service=service,metering:service=service,rabbitmq:service=service,volume:service=service,mysql:service=service"
-export CONSOLE_CREDENTIALS="admin:console=console,compute:console=console,dashboard:console=console,image:console=console,metering:console=console,network:console=console,object-store:console=console,volume:console=console"
+export SERVICE_CREDENTIALS="image:service=service,compute:service=service,dashboard:service=service,identity:service=service,metering:service=service,rabbitmq:service=service,volume:service=service,mysql:service=service,heat:heat=heat_secret"
+export CONSOLE_CREDENTIALS="admin:console=console,compute:console=console,dashboard:console=console,image:console=console,metering:console=console,network:console=console,object-store:console=console,volume:console=console,heat:heat=heat_db_secret"
export PACKAGE_CONFIG_FILENAME=""