Merge "Fix the Cyborg service"

ansible/roles/cyborg/defaults/main.yml

@@ -141,8 +141,8 @@ cyborg_conductor_extra_volumes: "{{ cyborg_extra_volumes }}"
 ####################
 # OpenStack
 ####################
-cyborg_internal_endpoint: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ cyborg_api_port }}"
-cyborg_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn | put_address_in_context('url') }}:{{ cyborg_api_port }}"
+cyborg_internal_endpoint: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ cyborg_api_port }}/v2"
+cyborg_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn | put_address_in_context('url') }}:{{ cyborg_api_port }}/v2"
 
 cyborg_logging_debug: "{{ openstack_logging_debug }}"
 
@@ -165,8 +165,8 @@ cyborg_enabled_notification_topics: "{{ cyborg_notification_topics | selectattr(
 ####################
 cyborg_ks_services:
   - name: "cyborg"
-    type: "cyborg"
-    description: "OpenStack Cyborg Service"
+    type: "accelerator"
+    description: "Acceleration Service"
     endpoints:
       - {'interface': 'internal', 'url': '{{ cyborg_internal_endpoint }}'}
       - {'interface': 'public', 'url': '{{ cyborg_public_endpoint }}'}

ansible/roles/cyborg/templates/cyborg.conf.j2

@@ -15,7 +15,7 @@ connection_recycle_time = {{ database_connection_recycle_time }}
 max_pool_size = {{ database_max_pool_size }}
 
 [keystone_authtoken]
-service_type = cyborg
+service_type = accelerator
 memcache_security_strategy = ENCRYPT
 memcache_secret_key = {{ memcache_secret_key }}
 memcache_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}

releasenotes/notes/fix-cyborg-service-5bc5bf8748daf504.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes the incorrect endpoint URLs and service type information for the
+    Cyborg service in the Keystone. `LP#2020080
+    <https://bugs.launchpad.net/kolla-ansible/+bug/2020080>`__