summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshuai chen <chenshuai@huawei.com>2016-06-07 00:58:02 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-06-07 00:58:02 +0000
commited9f4281ebb2b719fc82f485a6f753c6ee5136a7 (patch)
tree8a94137a84cde8d1de3e9cac669deaddec934ebc
parent35ea15219ff753bb0f4ebd871b6b7070a2aef31f (diff)
parent83d54737f61538cad93df8bbcdb263503b11592a (diff)
Merge "Add aodh default credentials"
-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 f009a4ac..24eb703d 100644
--- a/deploy/conf/base.conf
+++ b/deploy/conf/base.conf
@@ -62,6 +62,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,image:service=service,metering:service=service,network:service=service,rabbitmq:service=service,volume:service=service,mysql:service=service,heat:heat=heat_db_secret"
-export CONSOLE_CREDENTIALS="admin:console=console,demo:console=console,compute:console=console,dashboard:console=console,identity:console=console,image:console=console,metering:console=console,network:console=console,object-store:console=console,volume:console=console,heat:heat=heat_secret"
+export SERVICE_CREDENTIALS="image:service=service,compute:service=service,dashboard:service=service,identity:service=service,image:service=service,metering:service=service,network:service=service,rabbitmq:service=service,volume:service=service,mysql:service=service,heat:heat=heat_db_secret,alarming:aodh=aodh_db_secret"
+export CONSOLE_CREDENTIALS="admin:console=console,demo:console=console,compute:console=console,dashboard:console=console,identity:console=console,image:console=console,metering:console=console,network:console=console,object-store:console=console,volume:console=console,heat:heat=heat_secret,alarming:aodh=aodh_secret"
export PACKAGE_CONFIG_FILENAME=""