openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Enable external public endpoint for MetricsQdr 

This patch adds public endpoint for MetricsQdr and makes the service to listen
on it when deployed on controller nodes (when enabled interior mode on controllers)

Change-Id: I0e4bb210064cc8a27dd3e041cb363c4add99662c
(cherry picked from commit 5ea84f71ea)
This commit is contained in:
Martin Magr 2019-10-02 22:21:49 +02:00
parent 7fa133734c
commit f38d39d144
10 changed files with 148 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ci/environments/multinode-3nodes-registry.yaml
View File

@ -18,6 +18,7 @@ parameter_defaults:
ControllerExtraConfig:
nova::compute::libvirt::services::libvirt_virt_type: qemu
nova::compute::libvirt::libvirt_virt_type: qemu
tripleo::profile::base::metrics::qdr::router_mode: interior
SwiftCeilometerPipelineEnabled: False
# Remove ContainerCli once this scenario is tested on CentOS8
ContainerCli: docker

1
ci/environments/scenario001-multinode-containers.yaml
View File

@ -101,6 +101,7 @@ parameter_defaults:
# telemetry.alarm_granularity must in sync with the archive policy, 60s
# too.
ceilometer::agent::polling::polling_interval: 15
tripleo::profile::base::metrics::qdr::router_mode: interior
ManagePolling: true
ManagePipeline: true
CeilometerEnableGnocchi: true

6
deployment/metrics/qdr-container-puppet.yaml
View File

@ -175,11 +175,7 @@ outputs:
- 5667
- 5668
- tripleo::profile::base::metrics::qdr::external_listener_addr:
str_replace:
template:
"%{hiera('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, PublicNetwork]}
get_param: [EndpointMap, MetricsQdrPublic, host]
tripleo::profile::base::metrics::qdr::listener_addr:
str_replace:
template:

2
environments/ssl/no-tls-endpoints-public-ip.yaml
View File

@ -66,6 +66,7 @@ parameter_defaults:
ManilaAdmin: {protocol: http, port: '8786', host: IP_ADDRESS}
ManilaInternal: {protocol: http, port: '8786', host: IP_ADDRESS}
ManilaPublic: {protocol: http, port: '8786', host: IP_ADDRESS}
MetricsQdrPublic: {protocol: 'amqp', port: '5666', host: IP_ADDRESS}
MistralAdmin: {protocol: http, port: '8989', host: IP_ADDRESS}
MistralInternal: {protocol: http, port: '8989', host: IP_ADDRESS}
MistralPublic: {protocol: http, port: '8989', host: IP_ADDRESS}
@ -102,4 +103,3 @@ parameter_defaults:
ZaqarWebSocketInternal: {protocol: ws, port: '9000', host: IP_ADDRESS}
ZaqarWebSocketPublic: {protocol: ws, port: '9000', host: IP_ADDRESS}
ZaqarWebSocketUIConfig: {protocol: ws, port: '3000', host: IP_ADDRESS}

2
environments/ssl/tls-endpoints-public-dns.yaml
View File

@ -62,6 +62,7 @@ parameter_defaults:
ManilaAdmin: {protocol: 'http', port: '8786', host: 'IP_ADDRESS'}
ManilaInternal: {protocol: 'http', port: '8786', host: 'IP_ADDRESS'}
ManilaPublic: {protocol: 'https', port: '13786', host: 'CLOUDNAME'}
MetricsQdrPublic: {protocol: 'amqp', port: '5666', host: 'CLOUDNAME'}
MistralAdmin: {protocol: 'http', port: '8989', host: 'IP_ADDRESS'}
MistralInternal: {protocol: 'http', port: '8989', host: 'IP_ADDRESS'}
MistralPublic: {protocol: 'https', port: '13989', host: 'CLOUDNAME'}
@ -98,4 +99,3 @@ parameter_defaults:
ZaqarWebSocketInternal: {protocol: 'ws', port: '9000', host: 'IP_ADDRESS'}
ZaqarWebSocketPublic: {protocol: 'wss', port: '9000', host: 'CLOUDNAME'}
ZaqarWebSocketUIConfig: {protocol: 'wss', port: '443', host: 'IP_ADDRESS'}

2
environments/ssl/tls-endpoints-public-ip.yaml
View File

@ -62,6 +62,7 @@ parameter_defaults:
ManilaAdmin: {protocol: 'http', port: '8786', host: 'IP_ADDRESS'}
ManilaInternal: {protocol: 'http', port: '8786', host: 'IP_ADDRESS'}
ManilaPublic: {protocol: 'https', port: '13786', host: 'IP_ADDRESS'}
MetricsQdrPublic: {protocol: 'amqp', port: '5666', host: 'IP_ADDRESS'}
MistralAdmin: {protocol: 'http', port: '8989', host: 'IP_ADDRESS'}
MistralInternal: {protocol: 'http', port: '8989', host: 'IP_ADDRESS'}
MistralPublic: {protocol: 'https', port: '13989', host: 'IP_ADDRESS'}
@ -98,4 +99,3 @@ parameter_defaults:
ZaqarWebSocketInternal: {protocol: 'ws', port: '9000', host: 'IP_ADDRESS'}
ZaqarWebSocketPublic: {protocol: 'wss', port: '9000', host: 'IP_ADDRESS'}
ZaqarWebSocketUIConfig: {protocol: 'wss', port: '443', host: 'IP_ADDRESS'}

2
environments/ssl/tls-everywhere-endpoints-dns.yaml
View File

@ -62,6 +62,7 @@ parameter_defaults:
ManilaAdmin: {protocol: 'https', port: '8786', host: 'CLOUDNAME'}
ManilaInternal: {protocol: 'https', port: '8786', host: 'CLOUDNAME'}
ManilaPublic: {protocol: 'https', port: '13786', host: 'CLOUDNAME'}
MetricsQdrPublic: {protocol: 'amqp', port: '5666', host: 'CLOUDNAME'}
MistralAdmin: {protocol: 'https', port: '8989', host: 'CLOUDNAME'}
MistralInternal: {protocol: 'https', port: '8989', host: 'CLOUDNAME'}
MistralPublic: {protocol: 'https', port: '13989', host: 'CLOUDNAME'}
@ -98,4 +99,3 @@ parameter_defaults:
ZaqarWebSocketInternal: {protocol: 'wss', port: '9000', host: 'CLOUDNAME'}
ZaqarWebSocketPublic: {protocol: 'wss', port: '9000', host: 'CLOUDNAME'}
ZaqarWebSocketUIConfig: {protocol: 'wss', port: '443', host: 'CLOUDNAME'}

6
network/endpoints/endpoint_data.yaml
View File

@ -176,6 +176,12 @@ Manila:
V1: /v1/%(tenant_id)s
port: 8786
MetricsQdr:
Public:
net_param: Public
port: 5666
protocol: amqp
Mistral:
Internal:
net_param: MistralApi

131
network/endpoints/endpoint_map.yaml
View File

@ -219,6 +219,10 @@ parameters:
protocol: http
port: '8786'
host: IP_ADDRESS
MetricsQdrPublic:
protocol: amqp
port: '5666'
host: IP_ADDRESS
MistralAdmin:
protocol: http
port: '8989'
@ -8354,6 +8358,133 @@ outputs:
- EndpointMap
- ManilaPublic
- port
MetricsQdrPublic:
host:
str_replace:
template:
get_param:
- EndpointMap
- MetricsQdrPublic
- host
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param:
- ServiceNetMap
- PublicNetwork
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param:
- ServiceNetMap
- PublicNetwork
template: NETWORK_uri
host_nobrackets:
str_replace:
template:
get_param:
- EndpointMap
- MetricsQdrPublic
- host
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param:
- ServiceNetMap
- PublicNetwork
IP_ADDRESS:
get_param:
- NetIpMap
- get_param:
- ServiceNetMap
- PublicNetwork
port:
get_param:
- EndpointMap
- MetricsQdrPublic
- port
protocol:
get_param:
- EndpointMap
- MetricsQdrPublic
- protocol
uri:
make_url:
scheme:
get_param:
- EndpointMap
- MetricsQdrPublic
- protocol
host:
str_replace:
template:
get_param:
- EndpointMap
- MetricsQdrPublic
- host
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param:
- ServiceNetMap
- PublicNetwork
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param:
- ServiceNetMap
- PublicNetwork
template: NETWORK_uri
port:
get_param:
- EndpointMap
- MetricsQdrPublic
- port
uri_no_suffix:
make_url:
scheme:
get_param:
- EndpointMap
- MetricsQdrPublic
- protocol
host:
str_replace:
template:
get_param:
- EndpointMap
- MetricsQdrPublic
- host
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param:
- ServiceNetMap
- PublicNetwork
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param:
- ServiceNetMap
- PublicNetwork
template: NETWORK_uri
port:
get_param:
- EndpointMap
- MetricsQdrPublic
- port
MistralAdmin:
host:
str_replace:

5
sample-env-generator/ssl.yaml
View File

@ -170,6 +170,7 @@ environments:
ManilaAdmin: {protocol: 'http', port: '8786', host: 'IP_ADDRESS'}
ManilaInternal: {protocol: 'http', port: '8786', host: 'IP_ADDRESS'}
ManilaPublic: {protocol: 'https', port: '13786', host: 'IP_ADDRESS'}
MetricsQdrPublic: {protocol: 'amqp', port: '5666', host: 'IP_ADDRESS'}
MistralAdmin: {protocol: 'http', port: '8989', host: 'IP_ADDRESS'}
MistralInternal: {protocol: 'http', port: '8989', host: 'IP_ADDRESS'}
MistralPublic: {protocol: 'https', port: '13989', host: 'IP_ADDRESS'}
@ -274,6 +275,7 @@ environments:
ManilaAdmin: {protocol: 'http', port: '8786', host: 'IP_ADDRESS'}
ManilaInternal: {protocol: 'http', port: '8786', host: 'IP_ADDRESS'}
ManilaPublic: {protocol: 'https', port: '13786', host: 'CLOUDNAME'}
MetricsQdrPublic: {protocol: 'amqp', port: '5666', host: 'CLOUDNAME'}
MistralAdmin: {protocol: 'http', port: '8989', host: 'IP_ADDRESS'}
MistralInternal: {protocol: 'http', port: '8989', host: 'IP_ADDRESS'}
MistralPublic: {protocol: 'https', port: '13989', host: 'CLOUDNAME'}
@ -378,6 +380,7 @@ environments:
ManilaAdmin: {protocol: 'https', port: '8786', host: 'CLOUDNAME'}
ManilaInternal: {protocol: 'https', port: '8786', host: 'CLOUDNAME'}
ManilaPublic: {protocol: 'https', port: '13786', host: 'CLOUDNAME'}
MetricsQdrPublic: {protocol: 'amqp', port: '5666', host: 'CLOUDNAME'}
MistralAdmin: {protocol: 'https', port: '8989', host: 'CLOUDNAME'}
MistralInternal: {protocol: 'https', port: '8989', host: 'CLOUDNAME'}
MistralPublic: {protocol: 'https', port: '13989', host: 'CLOUDNAME'}
@ -492,6 +495,7 @@ environments:
ManilaAdmin: {protocol: http, port: '8786', host: IP_ADDRESS}
ManilaInternal: {protocol: http, port: '8786', host: IP_ADDRESS}
ManilaPublic: {protocol: http, port: '8786', host: IP_ADDRESS}
MetricsQdrPublic: {protocol: 'amqp', port: '5666', host: IP_ADDRESS}
MistralAdmin: {protocol: http, port: '8989', host: IP_ADDRESS}
MistralInternal: {protocol: http, port: '8989', host: IP_ADDRESS}
MistralPublic: {protocol: http, port: '8989', host: IP_ADDRESS}
@ -528,4 +532,3 @@ environments:
ZaqarWebSocketInternal: {protocol: ws, port: '9000', host: IP_ADDRESS}
ZaqarWebSocketPublic: {protocol: ws, port: '9000', host: IP_ADDRESS}
ZaqarWebSocketUIConfig: {protocol: ws, port: '3000', host: IP_ADDRESS}