openstack/openstack-ansible-os_octavia
Code Issues Proposed changes

Omit amp_ssh_access_allowed and remove amp_image_id options.

Browse Source 
Octavia complains about option amp_ssh_access_allowed to be deprecated. See
https://docs.openstack.org/octavia/ussuri/configuration/configref.html#controller_worker.amp_ssh_access_allowed
The octavia_ssh_enabled OSA variable is instead used to either write the
amp_ssh_key_name configuration option or not.

The configuration option amp_image_id in Octavia is deprected and image tags
should be used instead. Therefore octavia_amp_image_id is removed.

Change-Id: Ibd5f3d2ca25f9bb880b0c535c59ef430bd1043be
(cherry picked from commit 50b83c79274d5cba9869ca4e52ac96a731445a84)
This commit is contained in:
Marcus Klein 2020-12-17 11:47:36 +01:00 committed by Bjoern Teipel
parent 3d0ca7da88
commit 6fb63e341f
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
defaults/main.yml
View File

@ -234,8 +234,6 @@ octavia_loadbalancer_topology: SINGLE
octavia_glance_image_tag: octavia-amphora-image
# add here the id of the image owner to avoid faked images being used
octavia_amp_image_owner_id:
# add here the glance image id if tagging is not used (not recommended for prod)
octavia_amp_image_id:
# download the image from an artefact server
# Note: The default is the Octavia test image so don't use that in prod
octavia_download_artefact: True

6
releasenotes/notes/remove_amp_image_id-433eefffba7d6a96.yaml Normal file
View File

@ -0,0 +1,6 @@
---
deprecations:
- |
Remove ``octavia_amp_image_id`` option as the corresponding configuration
option in Octavia ``amp_image_id`` is deprected and image tags should be
used instead.

4
templates/octavia.conf.j2
View File

@ -89,12 +89,12 @@ server_ca = /etc/octavia/certs/server_ca.pem
[controller_worker]
amp_active_retries = {{ octavia_amp_active_retries }}
amp_image_id = {{ octavia_amp_image_id }}
amp_image_tag = {{ octavia_glance_image_tag }}
amp_image_owner_id = {{ octavia_amp_image_owner_id }}
amp_flavor_id = {{ octavia_nova_flavor_uuid }}
{% if octavia_ssh_enabled %}
amp_ssh_key_name = {{ octavia_ssh_key_name }}
amp_ssh_access_allowed = {{ octavia_ssh_enabled }}
{% endif %}
amp_boot_network_list = {{ octavia_neutron_management_network_uuid }}
amp_secgroup_list = {{ octavia_security_group_name }}
client_ca = /etc/octavia/certs/client_ca.pem