openstack/kolla-ansible
Code Issues Proposed changes

Construct service REST API urls using configured protocol

Browse Source 
Service REST API urls should be constructed using the
{{ internal_protocol }} and {{ external_protocol }} configuration
parameters.

Change-Id: Id1e8098cf59f66aa35b371149fdb4b517fa4c908
Closes-Bug: 1862817
This commit is contained in:
James Kirsch 2020-02-11 10:52:23 -08:00
parent 52cb500fbd
commit d41f072c7b
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/grafana/templates/prometheus.yaml.j2
View File

@ -5,5 +5,5 @@ datasources:
type: prometheus type: prometheus
access: proxy access: proxy
orgId: 1 orgId: 1
url: http://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ prometheus_port }} url: {{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ prometheus_port }}
version: 1 version: 1

2
ansible/roles/ironic/templates/inspector.ipxe.j2
View File

@ -13,6 +13,6 @@ chain pxelinux.cfg/${mac:hexhyp} || goto inspector_ipa
:inspector_ipa :inspector_ipa
:retry_boot :retry_boot
imgfree imgfree
kernel --timeout 30000 {{ ironic_ipxe_url }}/ironic-agent.kernel ipa-inspection-callback-url=http://{{ ironic_inspector_internal_fqdn | put_address_in_context('url') }}:{{ ironic_inspector_port }}/v1/continue systemd.journald.forward_to_console=yes BOOTIF=${mac} initrd=ironic-agent.initramfs {{ ironic_inspector_kernel_cmdline_extras | join(' ') }} || goto retry_boot kernel --timeout 30000 {{ ironic_ipxe_url }}/ironic-agent.kernel ipa-inspection-callback-url={{ internal_protocol }}://{{ ironic_inspector_internal_fqdn | put_address_in_context('url') }}:{{ ironic_inspector_port }}/v1/continue systemd.journald.forward_to_console=yes BOOTIF=${mac} initrd=ironic-agent.initramfs {{ ironic_inspector_kernel_cmdline_extras | join(' ') }} || goto retry_boot
initrd --timeout 30000 {{ ironic_ipxe_url }}/ironic-agent.initramfs || goto retry_boot initrd --timeout 30000 {{ ironic_ipxe_url }}/ironic-agent.initramfs || goto retry_boot
boot boot

2
ansible/roles/ironic/templates/pxelinux.default.j2
View File

@ -2,6 +2,6 @@ default introspect
label introspect label introspect
kernel ironic-agent.kernel kernel ironic-agent.kernel
append initrd=ironic-agent.initramfs ipa-inspection-callback-url=http://{{ ironic_inspector_internal_fqdn | put_address_in_context('url') }}:{{ ironic_inspector_port }}/v1/continue systemd.journald.forward_to_console=yes {{ ironic_inspector_kernel_cmdline_extras | join(' ') }} append initrd=ironic-agent.initramfs ipa-inspection-callback-url={{ internal_protocol }}://{{ ironic_inspector_internal_fqdn | put_address_in_context('url') }}:{{ ironic_inspector_port }}/v1/continue systemd.journald.forward_to_console=yes {{ ironic_inspector_kernel_cmdline_extras | join(' ') }}
ipappend 3 ipappend 3

2
ansible/roles/prometheus/defaults/main.yml
View File

@ -108,7 +108,7 @@ prometheus_mysql_exporter_database_user: "{% if use_preconfigured_databases | bo
# 'service_name:blackbox_exporter_module:endpoint' for example: # 'service_name:blackbox_exporter_module:endpoint' for example:
# #
# prometheus_blackbox_exporter_targets: # prometheus_blackbox_exporter_targets:
# - 'glance:os_endpoint:http://{{ kolla_external_fqdn | put_address_in_context('url') }}:{{ glance_api_port}}' # - 'glance:os_endpoint:{{ external_protocol }}://{{ kolla_external_fqdn | put_address_in_context('url') }}:{{ glance_api_port}}'
# #
# For a list of modules see the alertmanager config. # For a list of modules see the alertmanager config.
prometheus_blackbox_exporter_endpoints: [] prometheus_blackbox_exporter_endpoints: []

6
releasenotes/notes/fix-rest-url-protocol-07db2f6ffe02f9b3.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Since Openstack services can now be configured to use TLS enabled REST
endpoints, urls should be constructed using the {{ internal_protocol }}
and {{ external_protocol }} configuration parameters.