From eefe3d66c18d6ff64bba8c4eb90af7e9218bba7a Mon Sep 17 00:00:00 2001 From: chhagarw Date: Tue, 22 Nov 2016 22:36:33 -0500 Subject: [PATCH] Trove service user configuration should be aligned In the case of trove, we follow service configuration as per the official manual installation documentation [1]. It uses trove_for_trove_usage as a service tenant unlike other openstack services which uses default service tenant. For any project service to work, the configuration [keystone_authtoken] section should be updated with the correct user, project, tenant and password. Proposed change fixes this issue so Trove service configurations are aligned with the trove admin user settings for tenant and password. [1]: http://docs.openstack.org/developer/trove/dev/manual_install.html Closes-bug: #1644079 Change-Id: I92a426132e20669731bc65526b20f60a3f34b348 --- defaults/main.yml | 4 ++-- tasks/trove_service_setup.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 840fc34..0a0af45 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -36,11 +36,11 @@ trove_regular_user_name: regular_trove_user trove_admin_user_name: admin_trove_user trove_service_name: trove -trove_service_user_name: trove +trove_service_user_name: "{{ trove_admin_user_name }}" trove_service_tenant_name: trove_for_trove_usage trove_service_type: database trove_service_description: "OpenStack DBaaS (Trove)" -trove_service_project_name: service +trove_service_project_name: "{{ trove_service_tenant_name }}" trove_service_admin_role_names: - admin trove_service_region: RegionOne diff --git a/tasks/trove_service_setup.yml b/tasks/trove_service_setup.yml index fb4fad4..8b52237 100644 --- a/tasks/trove_service_setup.yml +++ b/tasks/trove_service_setup.yml @@ -88,7 +88,7 @@ insecure: "{{ keystone_service_adminuri_insecure }}" user_name: "{{ trove_admin_user_name }}" tenant_name: "{{ trove_service_tenant_name }}" - password: "{{ trove_admin_user_password }}" + password: "{{ trove_service_password }}" project_name: "{{ trove_service_project_name }}" register: add_trove_admin_user until: add_trove_admin_user |success