diff options
| author |   Justin chi <chigang@huawei.com> | 2016-11-28 08:47:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-11-28 08:47:52 +0000 |
| commit | f867a54a4634f99141065d0ef52b21d32670fab6 (patch) | |
| tree | 8fa8c9165e5f827c4074285c8b1917032fea245f /deploy | |
| parent | ba0903e3edf342cc23fe9a61857bdb5a8480b17a (diff) | |
| parent | 1f9a3e6e65e720509e2daf20e3d01bb79e6668f8 (diff) | |
Merge "fix demo user has no password bug" into stable/colorado
Diffstat (limited to 'deploy')
| -rw-r--r-- | deploy/adapters/ansible/openstack_mitaka/roles/keystone/vars/main.yml | 2 | ||||
| -rw-r--r-- | deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/vars/main.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/keystone/vars/main.yml b/deploy/adapters/ansible/openstack_mitaka/roles/keystone/vars/main.yml index 9e97a29c..b049ee0b 100644 --- a/deploy/adapters/ansible/openstack_mitaka/roles/keystone/vars/main.yml +++ b/deploy/adapters/ansible/openstack_mitaka/roles/keystone/vars/main.yml @@ -157,7 +157,7 @@ os_users: tenant_description: "Service Tenant" - user: demo - password: "" + password: "{{ DEMO_PASS }}" email: heat@demo.com role: heat_stack_user tenant: demo diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/vars/main.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/vars/main.yml index ac548a09..b4d3d7e0 100644 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/vars/main.yml +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/vars/main.yml @@ -165,7 +165,7 @@ os_users: tenant_description: "Service Tenant" - user: demo - password: "" + password: "{{ DEMO_PASS }}" email: heat@demo.com role: heat_stack_user tenant: demo |