From 06ab41cf19339427bb613cc6859269d2a2e2b4d6 Mon Sep 17 00:00:00 2001
From: Matt Thompson <mattt@defunct.ca>
Date: Tue, 14 Apr 2015 16:48:45 +0100
Subject: [PATCH] Use different passwords for admin and keystone users

Currently, the keystone service user is created w/ the same password as
the admin user.  This change updates the keystone service user creation
to be done w/ the value of keystone_service_password instead of
keystone_auth_admin_password.

Change-Id: Icc643c3a79ca5f58b53651b90695adafb83532e5
Closes-Bug: #1443955
---
 playbooks/roles/os_keystone/tasks/keystone_service_setup.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/playbooks/roles/os_keystone/tasks/keystone_service_setup.yml b/playbooks/roles/os_keystone/tasks/keystone_service_setup.yml
index 499d157616..771971ce55 100644
--- a/playbooks/roles/os_keystone/tasks/keystone_service_setup.yml
+++ b/playbooks/roles/os_keystone/tasks/keystone_service_setup.yml
@@ -141,7 +141,7 @@
     - keystone-service-add
     - keystone-setup
 
-# Create an admin user
+# Create a service user
 - name: Ensure Keystone user
   keystone:
     command: "ensure_user"
@@ -149,7 +149,7 @@
     endpoint: "{{ keystone_service_adminurl }}"
     user_name: "{{ keystone_service_user_name }}"
     tenant_name: "{{ keystone_service_tenant_name }}"
-    password: "{{ keystone_auth_admin_password }}"
+    password: "{{ keystone_service_password }}"
   register: add_service
   until: add_service|success
   retries: 5