openstack
/
openstack-ansible-os_sahara
Code Issues Proposed changes

Add trustee section by default 

Added [trustee] section and variables based on the changes outlined
in https://review.openstack.org/#/c/524936/13/devstack/plugin.sh

Change-Id: I3b8d7dcb57d4373c415e11266a4672c86ccb9166
Closes-Bug: #1763361
This commit is contained in:
d34dh0r53 2018-05-21 17:01:20 -07:00 committed by Dave Wilde
parent 2a29ec3c7f
commit 832b8ee246
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
defaults/main.yml
View File

@ -97,6 +97,8 @@ sahara_service_user_name: sahara
sahara_service_project_name: service
sahara_service_project_domain_id: default
sahara_service_user_domain_id: default
sahara_service_project_domain_name: Default
sahara_service_user_domain_name: Default
sahara_service_publicuri: "{{ sahara_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ sahara_service_port }}"
sahara_service_publicurl: "{{ sahara_service_publicuri }}/v1.1/%(tenant_id)s"
sahara_service_internaluri: "{{ sahara_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ sahara_service_port }}"

13
templates/sahara.conf.j2
View File

@ -41,11 +41,6 @@ project_name = {{ sahara_service_project_name }}
username = {{ sahara_service_user_name }}
password = {{ sahara_service_password }}
# parameters needed for trusts creation
admin_tenant_name = {{ sahara_service_project_name }}
admin_user = {{ sahara_service_user_name }}
admin_password = {{ sahara_service_password }}
memcached_servers = {{ memcached_servers }}
token_cache_time = 300
@ -71,3 +66,11 @@ ssl = {{ sahara_oslomsg_rpc_use_ssl }}
[profiler]
enabled = {{ sahara_profiler_enabled }}
[trustee]
auth_url = {{ keystone_service_adminurl }}
username = {{ sahara_service_user_name }}
password = {{ sahara_service_password }}
project_name = {{ sahara_service_project_name }}
user_domain_name = {{ sahara_service_user_domain_name }}
project_domain_name = {{ sahara_service_project_domain_name }}