From 69f47bc587ef5a7b18d6610e8a749436cd64130d Mon Sep 17 00:00:00 2001
From: Samuel Matzek <smatzek@us.ibm.com>
Date: Wed, 26 Jul 2017 11:40:42 -0500
Subject: [PATCH] Remove trove_regular_user

Remove the unnecessary trove_regular_user.  The documenation that was
referenced [1] when this was added to the role is intended to configure
Trove for development purposes. The trove_regular_user is not used by the
Trove service and is only being created to give the developer a non-admin
user to use for testing.

[1] https://docs.openstack.org/trove/latest/install/manual_install.html

Change-Id: I7c9289e191255e92530ea62568b212320f705ff8
---
 defaults/main.yml             |  2 --
 doc/source/index.rst          |  1 -
 extras/user_secrets.yml       |  1 -
 tasks/trove_service_setup.yml | 22 ----------------------
 tests/os_trove-overrides.yml  |  1 -
 5 files changed, 27 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 2d0e923..91b1b4e 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -33,7 +33,6 @@ trove_api_program_name: trove-api
 trove_conductor_program_name: trove-conductor
 trove_taskmanager_program_name: trove-taskmanager
 
-trove_regular_user_name: regular_trove_user
 trove_admin_user_name: admin_trove_user
 
 trove_service_name: trove
@@ -173,7 +172,6 @@ trove_required_secrets:
   - trove_rabbitmq_password
   - trove_service_password
   - trove_admin_user_password
-  - trove_regular_user_password
   - trove_taskmanager_rpc_encr_key
   - trove_inst_rpc_key_encr_key
 
diff --git a/doc/source/index.rst b/doc/source/index.rst
index f74696e..7005be3 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -32,7 +32,6 @@ details.
     trove_rabbitmq_password:
     trove_service_password:
     trove_admin_user_password:
-    trove_regular_user_password:
 
     # Trove RPC encryption keys.
     trove_taskmanager_rpc_encr_key:
diff --git a/extras/user_secrets.yml b/extras/user_secrets.yml
index 5641043..1bf5cdf 100755
--- a/extras/user_secrets.yml
+++ b/extras/user_secrets.yml
@@ -3,6 +3,5 @@ trove_galera_password:
 trove_rabbitmq_password:
 trove_service_password:
 trove_admin_user_password:
-trove_regular_user_password:
 trove_taskmanager_rpc_encr_key:
 trove_inst_rpc_key_encr_key:
diff --git a/tasks/trove_service_setup.yml b/tasks/trove_service_setup.yml
index 1445f7e..57cfa8f 100644
--- a/tasks/trove_service_setup.yml
+++ b/tasks/trove_service_setup.yml
@@ -56,28 +56,6 @@
     - trove-service-add
     - trove-setup
 
-- name: Ensure the trove regular user exists
-  keystone:
-    command: "ensure_user"
-    endpoint: "{{ keystone_service_adminurl }}"
-    login_user: "{{ keystone_admin_user_name }}"
-    login_password: "{{ keystone_auth_admin_password }}"
-    login_project_name: "{{ keystone_admin_tenant_name }}"
-    insecure: "{{ keystone_service_adminuri_insecure }}"
-    user_name: "{{ trove_regular_user_name }}"
-    tenant_name: "{{ trove_service_tenant_name }}"
-    password: "{{ trove_regular_user_password }}"
-    project_name: "{{ trove_service_project_name }}"
-  register: add_trove_regular_user
-  until: add_trove_regular_user |success
-  retries: 5
-  delay: 2
-  tags:
-    - trove-api-setup
-    - trove-service-add
-    - trove-user-add
-    - trove-setup
-
 - name: Ensure the trove admin user exists
   keystone:
     command: "ensure_user"
diff --git a/tests/os_trove-overrides.yml b/tests/os_trove-overrides.yml
index 797c88c..dfee4e0 100644
--- a/tests/os_trove-overrides.yml
+++ b/tests/os_trove-overrides.yml
@@ -31,7 +31,6 @@ trove_guest_rabbitmq_servers: "{{ trove_rabbitmq_servers }}"
 trove_guest_auth_url: "{{ trove_auth_url }}"
 trove_requirements_git_install_branch: master
 trove_service_password: "secrete"
-trove_regular_user_password: "secrete"
 trove_admin_user_password: "secrete"
 trove_taskmanager_rpc_encr_key: bzH6y0SGmjuoY0FNSTptrhgieGXNDX6PIhvz
 trove_inst_rpc_key_encr_key: emYjgHFqfXNB1NGehAFIUeoyw4V4XwWHEaKP