Support service tokens
Implement support for service_tokens. For that we convert role_name to be a list along with renaming corresponding variable. Additionally service_type is defined now for keystone_authtoken which enables to validate tokens with restricted access rules Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-plugins/+/845690 Change-Id: I7064765e62d9e1a86fb20232429731840f697a88
This commit is contained in:
parent
f8ff70e99c
commit
816e498c5c
|
@ -102,7 +102,6 @@ sahara_db_max_pool_size: "{{ openstack_db_max_pool_size | default('5') }}"
|
||||||
sahara_db_pool_timeout: "{{ openstack_db_pool_timeout | default('30') }}"
|
sahara_db_pool_timeout: "{{ openstack_db_pool_timeout | default('30') }}"
|
||||||
sahara_db_connection_recycle_time: "{{ openstack_db_connection_recycle_time | default('600') }}"
|
sahara_db_connection_recycle_time: "{{ openstack_db_connection_recycle_time | default('600') }}"
|
||||||
|
|
||||||
sahara_role_name: admin
|
|
||||||
sahara_api_bind_address: "{{ openstack_service_bind_address | default('0.0.0.0') }}"
|
sahara_api_bind_address: "{{ openstack_service_bind_address | default('0.0.0.0') }}"
|
||||||
sahara_api_service_port: 8386
|
sahara_api_service_port: 8386
|
||||||
|
|
||||||
|
@ -123,6 +122,12 @@ sahara_service_project_domain_id: default
|
||||||
sahara_service_user_domain_id: default
|
sahara_service_user_domain_id: default
|
||||||
sahara_service_project_domain_name: Default
|
sahara_service_project_domain_name: Default
|
||||||
sahara_service_user_domain_name: Default
|
sahara_service_user_domain_name: Default
|
||||||
|
sahara_service_role_names:
|
||||||
|
- admin
|
||||||
|
- service
|
||||||
|
sahara_service_token_roles:
|
||||||
|
- service
|
||||||
|
sahara_service_token_roles_required: "{{ openstack_service_token_roles_required | default(True) }}"
|
||||||
sahara_service_publicuri: "{{ sahara_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ sahara_service_port }}"
|
sahara_service_publicuri: "{{ sahara_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ sahara_service_port }}"
|
||||||
sahara_service_internaluri: "{{ sahara_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ sahara_service_port }}"
|
sahara_service_internaluri: "{{ sahara_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ sahara_service_port }}"
|
||||||
sahara_service_adminuri: "{{ sahara_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ sahara_service_port }}"
|
sahara_service_adminuri: "{{ sahara_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ sahara_service_port }}"
|
||||||
|
|
|
@ -145,7 +145,7 @@
|
||||||
_service_users:
|
_service_users:
|
||||||
- name: "{{ sahara_service_user_name }}"
|
- name: "{{ sahara_service_user_name }}"
|
||||||
password: "{{ sahara_service_password }}"
|
password: "{{ sahara_service_password }}"
|
||||||
role: "{{ sahara_role_name }}"
|
role: "{{ sahara_service_role_names }}"
|
||||||
_service_endpoints:
|
_service_endpoints:
|
||||||
- service: "{{ sahara_service_name }}"
|
- service: "{{ sahara_service_name }}"
|
||||||
interface: "public"
|
interface: "public"
|
||||||
|
|
|
@ -44,6 +44,10 @@ project_name = {{ sahara_service_project_name }}
|
||||||
username = {{ sahara_service_user_name }}
|
username = {{ sahara_service_user_name }}
|
||||||
password = {{ sahara_service_password }}
|
password = {{ sahara_service_password }}
|
||||||
|
|
||||||
|
service_token_roles_required = {{ sahara_service_token_roles_required | bool }}
|
||||||
|
service_token_roles = {{ sahara_service_token_roles | join(',') }}
|
||||||
|
service_type = {{ sahara_service_type }}
|
||||||
|
|
||||||
memcached_servers = {{ sahara_memcached_servers }}
|
memcached_servers = {{ sahara_memcached_servers }}
|
||||||
|
|
||||||
token_cache_time = 300
|
token_cache_time = 300
|
||||||
|
|
Loading…
Reference in New Issue