Update tempest to use admin user

Currently, keystone tasks in the tempest role use a combination of
keystone_service_user_name and keystone_auth_admin_password, which only
works due to bug #1443955.  This change updates the tempest role to
use keystone_auth_admin_token / keystone_service_adminurl when
performing keystone actions, which is the same pattern that exists in
other roles.

Additionally, we update os_tempest/templates/tempest.conf.j2 to use
keystone_admin_user_name / keystone_admin_tenant_name instead of
keystone_service_user_name / keystone_service_tenant_name.  This fixes
the keystone_service_user_name / keystone_auth_admin_password
discrepancy while also being more logical than using the actual
keystone service user / password within tempest.conf.

Closes-Bug: #1443962
Change-Id: I63391095557501693bbe663aba3219ca5c292057

playbooks/roles/os_tempest/tasks/tempest_post_install.yml

@@ -16,11 +16,9 @@
 - name: Get admin tenant id
   keystone:
     command: get_tenant
+    token: "{{ keystone_auth_admin_token }}"
     tenant_name: admin
-    endpoint: "{{ keystone_service_internalurl }}"
-    login_tenant_name: "{{ keystone_service_tenant_name }}"
-    login_user: "{{ keystone_service_user_name }}"
-    login_password: "{{ keystone_auth_admin_password }}"
+    endpoint: "{{ keystone_service_adminurl }}"
   register: add_service
   until: add_service|success
   retries: 5

playbooks/roles/os_tempest/tasks/tempest_resources.yml

@@ -36,12 +36,10 @@
 - name: Ensure tempest tenants
   keystone:
     command: ensure_tenant
+    token: "{{ keystone_auth_admin_token }}"
     tenant_name: "{{ item }}"
     description: "{{ item }} Tenant"
-    endpoint: "{{ keystone_service_internalurl }}"
-    login_tenant_name: "{{ keystone_service_tenant_name }}"
-    login_user: "{{ keystone_service_user_name }}"
-    login_password: "{{ keystone_auth_admin_password }}"
+    endpoint: "{{ keystone_service_adminurl }}"
   register: add_service
   until: add_service|success
   retries: 5
@@ -55,14 +53,12 @@
 - name: Ensure tempest users
   keystone:
     command: ensure_user
+    token: "{{ keystone_auth_admin_token }}"
     tenant_name: "{{ item }}"
     user_name: "{{ item }}"
     password: "{{ item }}"
     description: "{{ item }} User"
-    endpoint: "{{ keystone_service_internalurl }}"
-    login_tenant_name: "{{ keystone_service_tenant_name }}"
-    login_user: "{{ keystone_service_user_name }}"
-    login_password: "{{ keystone_auth_admin_password }}"
+    endpoint: "{{ keystone_service_adminurl }}"
   register: add_service
   until: add_service|success
   retries: 5
@@ -76,13 +72,11 @@
 - name: Ensure tempest users have heat_stack_owners role
   keystone:
     command: ensure_user_role
+    token: "{{ keystone_auth_admin_token }}"
     tenant_name: "{{ item }}"
     user_name: "{{ item }}"
     role_name: heat_stack_owner
-    endpoint: "{{ keystone_service_internalurl }}"
-    login_tenant_name: "{{ keystone_service_tenant_name }}"
-    login_user: "{{ keystone_service_user_name }}"
-    login_password: "{{ keystone_auth_admin_password }}"
+    endpoint: "{{ keystone_service_adminurl }}"
   register: add_service
   until: add_service|success
   retries: 5
@@ -96,10 +90,8 @@
 - name: Ensure reseller_admin role
   keystone:
     command: ensure_role
-    endpoint: "{{ keystone_service_internalurl }}"
-    login_tenant_name: "{{ keystone_service_tenant_name }}"
-    login_user: "{{ keystone_service_user_name }}"
-    login_password: "{{ keystone_auth_admin_password }}"
+    token: "{{ keystone_auth_admin_token }}"
+    endpoint: "{{ keystone_service_adminurl }}"
     role_name: "reseller_admin"
   register: add_service
   until: add_service|success
@@ -111,11 +103,9 @@
 - name: Ensure remote_image role exists
   keystone:
     command: ensure_role
+    token: "{{ keystone_auth_admin_token }}"
     role_name: remote_image
-    endpoint: "{{ keystone_service_internalurl }}"
-    login_tenant_name: "{{ keystone_service_tenant_name }}"
-    login_user: "{{ keystone_service_user_name }}"
-    login_password: "{{ keystone_auth_admin_password }}"
+    endpoint: "{{ keystone_service_adminurl }}"
   register: add_service
   until: add_service|success
   retries: 5
@@ -126,11 +116,9 @@
 - name: Get demo tenant id
   keystone:
     command: get_tenant
+    token: "{{ keystone_auth_admin_token }}"
     tenant_name: demo
-    endpoint: "{{ keystone_service_internalurl }}"
-    login_tenant_name: "{{ keystone_service_tenant_name }}"
-    login_user: "{{ keystone_service_user_name }}"
-    login_password: "{{ keystone_auth_admin_password }}"
+    endpoint: "{{ keystone_service_adminurl }}"
   register: add_service
   until: add_service|success
   retries: 5

playbooks/roles/os_tempest/templates/tempest.conf.j2

@@ -103,8 +103,8 @@ dashboard_url = {{ tempest_dashboard_url }}
 admin_domain_name = Default
 admin_password = {{ keystone_auth_admin_password }}
 admin_role = admin
-admin_tenant_name = {{ keystone_service_tenant_name }}
-admin_username = {{ keystone_service_user_name }}
+admin_tenant_name = {{ keystone_admin_tenant_name }}
+admin_username = {{ keystone_admin_user_name }}
 admin_tenant_id = {{ tempest_admin_tenant_id }}
 alt_tenant_name = alt_demo
 alt_password = alt_demo