Merge "Support service tokens"

defaults/main.yml

@@ -152,7 +152,12 @@ mistral_service_user_domain_id: default
 mistral_service_user_name: mistral
 mistral_service_project_domain_id: default
 mistral_service_project_name: service
-mistral_role_name: admin
+mistral_service_role_names:
+  - admin
+  - service
+mistral_service_token_roles:
+  - service
+mistral_service_token_roles_required: "{{ openstack_service_token_roles_required | default(True) }}"
 mistral_service_region: "{{ service_region | default('RegionOne') }}"
 mistral_service_proto: http
 mistral_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(mistral_service_proto) }}"

tasks/main.yml

@@ -160,7 +160,7 @@
     _service_users:
       - name: "{{ mistral_service_user_name }}"
         password: "{{ mistral_service_password }}"
-        role: "{{ mistral_role_name }}"
+        role: "{{ mistral_service_role_names }}"
     _service_endpoints:
       - service: "{{ mistral_service_name }}"
         interface: "public"

templates/mistral.conf.j2

@@ -26,6 +26,11 @@ project_name = {{ mistral_service_project_name }}
 username = {{ mistral_service_user_name }}
 password = {{ mistral_service_password }}
 region_name = {{ keystone_service_region }}
+
+service_token_roles_required = {{ mistral_service_token_roles_required | bool }}
+service_token_roles = {{ mistral_service_token_roles | join(',') }}
+service_type = {{ mistral_service_type }}
+
 memcached_servers = {{ mistral_memcached_servers }}
 memcache_security_strategy = ENCRYPT
 memcache_secret_key = {{ memcached_encryption_key }}