openstack/kolla-ansible
Code Issues Proposed changes

Fix the Cyborg service

Browse Source 
According to the documentation [1] type of the Cyborg service should
be 'accelerator' and description 'Acceleration Service'. Also, this
change fixes incorrect endpoint URLs, and not configures an admin
endpoint [2] because the documentation [1] not updated yet.

1. https://docs.openstack.org/cyborg/latest/install/common.html
2. Icf3bf08deab2c445361f0a0124d87ad8b0e4e9d9

Closes-Bug: #2020080
Change-Id: I002db50cbad5a90e479498e605bdeab343e129c7
Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
This commit is contained in:
Maksim Malchuk 2023-05-18 15:17:43 +03:00
parent 05bcccbdeb
commit e8250d2824
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ansible/roles/cyborg/defaults/main.yml
View File

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

2
ansible/roles/cyborg/templates/cyborg.conf.j2
View File

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

6
releasenotes/notes/fix-cyborg-service-5bc5bf8748daf504.yaml Normal file
View File

@ -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>`__