diff options
author | baigk <baiguoku@huawei.com> | 2015-12-29 22:38:04 +0800 |
---|---|---|
committer | baigk <baiguoku@huawei.com> | 2015-12-31 07:41:26 +0000 |
commit | 4a6728a4fc08adb68cb3da2f3af8f1e366693a82 (patch) | |
tree | 18435b9014988900d54bdc2e733ec0a143a06698 /deploy | |
parent | bb77d2e1d5a41da912b8d3a09c825d74ead18cb1 (diff) |
modify the network and indentity password
Change-Id: I000b580de67f01ea2b2a68ed0bfdefd09de610e8
Signed-off-by: baigk <baiguoku@huawei.com>
Diffstat (limited to 'deploy')
-rw-r--r-- | deploy/adapters/ansible/roles/keystone/vars/main.yml | 2 | ||||
-rw-r--r-- | deploy/conf/base.conf | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/deploy/adapters/ansible/roles/keystone/vars/main.yml b/deploy/adapters/ansible/roles/keystone/vars/main.yml index dc660e97..73582252 100644 --- a/deploy/adapters/ansible/roles/keystone/vars/main.yml +++ b/deploy/adapters/ansible/roles/keystone/vars/main.yml @@ -99,7 +99,7 @@ os_users: tenant_description: "Service Tenant" - user: keystone - password: "{{ keystone_PASS }}" + password: "{{ KEYSTONE_PASS }}" email: keystone@admin.com role: admin tenant: service diff --git a/deploy/conf/base.conf b/deploy/conf/base.conf index 440b3e03..d7d2f4ef 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,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 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 PACKAGE_CONFIG_FILENAME="" |