Merge "Enable external public endpoint for MetricsQdr" into stable/train
This commit is contained in:
commit
d3d6dc34c1
@ -18,6 +18,7 @@ parameter_defaults:
|
|||||||
ControllerExtraConfig:
|
ControllerExtraConfig:
|
||||||
nova::compute::libvirt::services::libvirt_virt_type: qemu
|
nova::compute::libvirt::services::libvirt_virt_type: qemu
|
||||||
nova::compute::libvirt::libvirt_virt_type: qemu
|
nova::compute::libvirt::libvirt_virt_type: qemu
|
||||||
|
tripleo::profile::base::metrics::qdr::router_mode: interior
|
||||||
SwiftCeilometerPipelineEnabled: False
|
SwiftCeilometerPipelineEnabled: False
|
||||||
# Remove ContainerCli once this scenario is tested on CentOS8
|
# Remove ContainerCli once this scenario is tested on CentOS8
|
||||||
ContainerCli: docker
|
ContainerCli: docker
|
||||||
|
@ -103,6 +103,7 @@ parameter_defaults:
|
|||||||
# telemetry.alarm_granularity must in sync with the archive policy, 60s
|
# telemetry.alarm_granularity must in sync with the archive policy, 60s
|
||||||
# too.
|
# too.
|
||||||
ceilometer::agent::polling::polling_interval: 15
|
ceilometer::agent::polling::polling_interval: 15
|
||||||
|
tripleo::profile::base::metrics::qdr::router_mode: interior
|
||||||
ManagePolling: true
|
ManagePolling: true
|
||||||
ManagePipeline: true
|
ManagePipeline: true
|
||||||
CeilometerEnableGnocchi: true
|
CeilometerEnableGnocchi: true
|
||||||
|
@ -175,11 +175,7 @@ outputs:
|
|||||||
- 5667
|
- 5667
|
||||||
- 5668
|
- 5668
|
||||||
- tripleo::profile::base::metrics::qdr::external_listener_addr:
|
- tripleo::profile::base::metrics::qdr::external_listener_addr:
|
||||||
str_replace:
|
get_param: [EndpointMap, MetricsQdrPublic, host]
|
||||||
template:
|
|
||||||
"%{hiera('$NETWORK')}"
|
|
||||||
params:
|
|
||||||
$NETWORK: {get_param: [ServiceNetMap, PublicNetwork]}
|
|
||||||
tripleo::profile::base::metrics::qdr::listener_addr:
|
tripleo::profile::base::metrics::qdr::listener_addr:
|
||||||
str_replace:
|
str_replace:
|
||||||
template:
|
template:
|
||||||
|
@ -66,6 +66,7 @@ parameter_defaults:
|
|||||||
ManilaAdmin: {protocol: http, port: '8786', host: IP_ADDRESS}
|
ManilaAdmin: {protocol: http, port: '8786', host: IP_ADDRESS}
|
||||||
ManilaInternal: {protocol: http, port: '8786', host: IP_ADDRESS}
|
ManilaInternal: {protocol: http, port: '8786', host: IP_ADDRESS}
|
||||||
ManilaPublic: {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}
|
MistralAdmin: {protocol: http, port: '8989', host: IP_ADDRESS}
|
||||||
MistralInternal: {protocol: http, port: '8989', host: IP_ADDRESS}
|
MistralInternal: {protocol: http, port: '8989', host: IP_ADDRESS}
|
||||||
MistralPublic: {protocol: http, port: '8989', host: IP_ADDRESS}
|
MistralPublic: {protocol: http, port: '8989', host: IP_ADDRESS}
|
||||||
@ -105,4 +106,3 @@ parameter_defaults:
|
|||||||
ZaqarWebSocketInternal: {protocol: ws, port: '9000', host: IP_ADDRESS}
|
ZaqarWebSocketInternal: {protocol: ws, port: '9000', host: IP_ADDRESS}
|
||||||
ZaqarWebSocketPublic: {protocol: ws, port: '9000', host: IP_ADDRESS}
|
ZaqarWebSocketPublic: {protocol: ws, port: '9000', host: IP_ADDRESS}
|
||||||
ZaqarWebSocketUIConfig: {protocol: ws, port: '3000', host: IP_ADDRESS}
|
ZaqarWebSocketUIConfig: {protocol: ws, port: '3000', host: IP_ADDRESS}
|
||||||
|
|
||||||
|
@ -62,6 +62,7 @@ parameter_defaults:
|
|||||||
ManilaAdmin: {protocol: 'http', port: '8786', host: 'IP_ADDRESS'}
|
ManilaAdmin: {protocol: 'http', port: '8786', host: 'IP_ADDRESS'}
|
||||||
ManilaInternal: {protocol: 'http', port: '8786', host: 'IP_ADDRESS'}
|
ManilaInternal: {protocol: 'http', port: '8786', host: 'IP_ADDRESS'}
|
||||||
ManilaPublic: {protocol: 'https', port: '13786', host: 'CLOUDNAME'}
|
ManilaPublic: {protocol: 'https', port: '13786', host: 'CLOUDNAME'}
|
||||||
|
MetricsQdrPublic: {protocol: 'amqp', port: '5666', host: 'CLOUDNAME'}
|
||||||
MistralAdmin: {protocol: 'http', port: '8989', host: 'IP_ADDRESS'}
|
MistralAdmin: {protocol: 'http', port: '8989', host: 'IP_ADDRESS'}
|
||||||
MistralInternal: {protocol: 'http', port: '8989', host: 'IP_ADDRESS'}
|
MistralInternal: {protocol: 'http', port: '8989', host: 'IP_ADDRESS'}
|
||||||
MistralPublic: {protocol: 'https', port: '13989', host: 'CLOUDNAME'}
|
MistralPublic: {protocol: 'https', port: '13989', host: 'CLOUDNAME'}
|
||||||
@ -101,4 +102,3 @@ parameter_defaults:
|
|||||||
ZaqarWebSocketInternal: {protocol: 'ws', port: '9000', host: 'IP_ADDRESS'}
|
ZaqarWebSocketInternal: {protocol: 'ws', port: '9000', host: 'IP_ADDRESS'}
|
||||||
ZaqarWebSocketPublic: {protocol: 'wss', port: '9000', host: 'CLOUDNAME'}
|
ZaqarWebSocketPublic: {protocol: 'wss', port: '9000', host: 'CLOUDNAME'}
|
||||||
ZaqarWebSocketUIConfig: {protocol: 'wss', port: '443', host: 'IP_ADDRESS'}
|
ZaqarWebSocketUIConfig: {protocol: 'wss', port: '443', host: 'IP_ADDRESS'}
|
||||||
|
|
||||||
|
@ -62,6 +62,7 @@ parameter_defaults:
|
|||||||
ManilaAdmin: {protocol: 'http', port: '8786', host: 'IP_ADDRESS'}
|
ManilaAdmin: {protocol: 'http', port: '8786', host: 'IP_ADDRESS'}
|
||||||
ManilaInternal: {protocol: 'http', port: '8786', host: 'IP_ADDRESS'}
|
ManilaInternal: {protocol: 'http', port: '8786', host: 'IP_ADDRESS'}
|
||||||
ManilaPublic: {protocol: 'https', port: '13786', 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'}
|
MistralAdmin: {protocol: 'http', port: '8989', host: 'IP_ADDRESS'}
|
||||||
MistralInternal: {protocol: 'http', port: '8989', host: 'IP_ADDRESS'}
|
MistralInternal: {protocol: 'http', port: '8989', host: 'IP_ADDRESS'}
|
||||||
MistralPublic: {protocol: 'https', port: '13989', host: 'IP_ADDRESS'}
|
MistralPublic: {protocol: 'https', port: '13989', host: 'IP_ADDRESS'}
|
||||||
@ -101,4 +102,3 @@ parameter_defaults:
|
|||||||
ZaqarWebSocketInternal: {protocol: 'ws', port: '9000', host: 'IP_ADDRESS'}
|
ZaqarWebSocketInternal: {protocol: 'ws', port: '9000', host: 'IP_ADDRESS'}
|
||||||
ZaqarWebSocketPublic: {protocol: 'wss', port: '9000', host: 'IP_ADDRESS'}
|
ZaqarWebSocketPublic: {protocol: 'wss', port: '9000', host: 'IP_ADDRESS'}
|
||||||
ZaqarWebSocketUIConfig: {protocol: 'wss', port: '443', host: 'IP_ADDRESS'}
|
ZaqarWebSocketUIConfig: {protocol: 'wss', port: '443', host: 'IP_ADDRESS'}
|
||||||
|
|
||||||
|
@ -62,6 +62,7 @@ parameter_defaults:
|
|||||||
ManilaAdmin: {protocol: 'https', port: '8786', host: 'CLOUDNAME'}
|
ManilaAdmin: {protocol: 'https', port: '8786', host: 'CLOUDNAME'}
|
||||||
ManilaInternal: {protocol: 'https', port: '8786', host: 'CLOUDNAME'}
|
ManilaInternal: {protocol: 'https', port: '8786', host: 'CLOUDNAME'}
|
||||||
ManilaPublic: {protocol: 'https', port: '13786', host: 'CLOUDNAME'}
|
ManilaPublic: {protocol: 'https', port: '13786', host: 'CLOUDNAME'}
|
||||||
|
MetricsQdrPublic: {protocol: 'amqp', port: '5666', host: 'CLOUDNAME'}
|
||||||
MistralAdmin: {protocol: 'https', port: '8989', host: 'CLOUDNAME'}
|
MistralAdmin: {protocol: 'https', port: '8989', host: 'CLOUDNAME'}
|
||||||
MistralInternal: {protocol: 'https', port: '8989', host: 'CLOUDNAME'}
|
MistralInternal: {protocol: 'https', port: '8989', host: 'CLOUDNAME'}
|
||||||
MistralPublic: {protocol: 'https', port: '13989', host: 'CLOUDNAME'}
|
MistralPublic: {protocol: 'https', port: '13989', host: 'CLOUDNAME'}
|
||||||
@ -101,4 +102,3 @@ parameter_defaults:
|
|||||||
ZaqarWebSocketInternal: {protocol: 'wss', port: '9000', host: 'CLOUDNAME'}
|
ZaqarWebSocketInternal: {protocol: 'wss', port: '9000', host: 'CLOUDNAME'}
|
||||||
ZaqarWebSocketPublic: {protocol: 'wss', port: '9000', host: 'CLOUDNAME'}
|
ZaqarWebSocketPublic: {protocol: 'wss', port: '9000', host: 'CLOUDNAME'}
|
||||||
ZaqarWebSocketUIConfig: {protocol: 'wss', port: '443', host: 'CLOUDNAME'}
|
ZaqarWebSocketUIConfig: {protocol: 'wss', port: '443', host: 'CLOUDNAME'}
|
||||||
|
|
||||||
|
@ -185,6 +185,12 @@ Manila:
|
|||||||
V1: /v1/%(tenant_id)s
|
V1: /v1/%(tenant_id)s
|
||||||
port: 8786
|
port: 8786
|
||||||
|
|
||||||
|
MetricsQdr:
|
||||||
|
Public:
|
||||||
|
net_param: Public
|
||||||
|
port: 5666
|
||||||
|
protocol: amqp
|
||||||
|
|
||||||
Mistral:
|
Mistral:
|
||||||
Internal:
|
Internal:
|
||||||
net_param: MistralApi
|
net_param: MistralApi
|
||||||
|
@ -219,6 +219,10 @@ parameters:
|
|||||||
protocol: http
|
protocol: http
|
||||||
port: '8786'
|
port: '8786'
|
||||||
host: IP_ADDRESS
|
host: IP_ADDRESS
|
||||||
|
MetricsQdrPublic:
|
||||||
|
protocol: amqp
|
||||||
|
port: '5666'
|
||||||
|
host: IP_ADDRESS
|
||||||
MistralAdmin:
|
MistralAdmin:
|
||||||
protocol: http
|
protocol: http
|
||||||
port: '8989'
|
port: '8989'
|
||||||
@ -8366,6 +8370,133 @@ outputs:
|
|||||||
- EndpointMap
|
- EndpointMap
|
||||||
- ManilaPublic
|
- ManilaPublic
|
||||||
- port
|
- 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:
|
MistralAdmin:
|
||||||
host:
|
host:
|
||||||
str_replace:
|
str_replace:
|
||||||
|
@ -170,6 +170,7 @@ environments:
|
|||||||
ManilaAdmin: {protocol: 'http', port: '8786', host: 'IP_ADDRESS'}
|
ManilaAdmin: {protocol: 'http', port: '8786', host: 'IP_ADDRESS'}
|
||||||
ManilaInternal: {protocol: 'http', port: '8786', host: 'IP_ADDRESS'}
|
ManilaInternal: {protocol: 'http', port: '8786', host: 'IP_ADDRESS'}
|
||||||
ManilaPublic: {protocol: 'https', port: '13786', 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'}
|
MistralAdmin: {protocol: 'http', port: '8989', host: 'IP_ADDRESS'}
|
||||||
MistralInternal: {protocol: 'http', port: '8989', host: 'IP_ADDRESS'}
|
MistralInternal: {protocol: 'http', port: '8989', host: 'IP_ADDRESS'}
|
||||||
MistralPublic: {protocol: 'https', port: '13989', host: 'IP_ADDRESS'}
|
MistralPublic: {protocol: 'https', port: '13989', host: 'IP_ADDRESS'}
|
||||||
@ -277,6 +278,7 @@ environments:
|
|||||||
ManilaAdmin: {protocol: 'http', port: '8786', host: 'IP_ADDRESS'}
|
ManilaAdmin: {protocol: 'http', port: '8786', host: 'IP_ADDRESS'}
|
||||||
ManilaInternal: {protocol: 'http', port: '8786', host: 'IP_ADDRESS'}
|
ManilaInternal: {protocol: 'http', port: '8786', host: 'IP_ADDRESS'}
|
||||||
ManilaPublic: {protocol: 'https', port: '13786', host: 'CLOUDNAME'}
|
ManilaPublic: {protocol: 'https', port: '13786', host: 'CLOUDNAME'}
|
||||||
|
MetricsQdrPublic: {protocol: 'amqp', port: '5666', host: 'CLOUDNAME'}
|
||||||
MistralAdmin: {protocol: 'http', port: '8989', host: 'IP_ADDRESS'}
|
MistralAdmin: {protocol: 'http', port: '8989', host: 'IP_ADDRESS'}
|
||||||
MistralInternal: {protocol: 'http', port: '8989', host: 'IP_ADDRESS'}
|
MistralInternal: {protocol: 'http', port: '8989', host: 'IP_ADDRESS'}
|
||||||
MistralPublic: {protocol: 'https', port: '13989', host: 'CLOUDNAME'}
|
MistralPublic: {protocol: 'https', port: '13989', host: 'CLOUDNAME'}
|
||||||
@ -384,6 +386,7 @@ environments:
|
|||||||
ManilaAdmin: {protocol: 'https', port: '8786', host: 'CLOUDNAME'}
|
ManilaAdmin: {protocol: 'https', port: '8786', host: 'CLOUDNAME'}
|
||||||
ManilaInternal: {protocol: 'https', port: '8786', host: 'CLOUDNAME'}
|
ManilaInternal: {protocol: 'https', port: '8786', host: 'CLOUDNAME'}
|
||||||
ManilaPublic: {protocol: 'https', port: '13786', host: 'CLOUDNAME'}
|
ManilaPublic: {protocol: 'https', port: '13786', host: 'CLOUDNAME'}
|
||||||
|
MetricsQdrPublic: {protocol: 'amqp', port: '5666', host: 'CLOUDNAME'}
|
||||||
MistralAdmin: {protocol: 'https', port: '8989', host: 'CLOUDNAME'}
|
MistralAdmin: {protocol: 'https', port: '8989', host: 'CLOUDNAME'}
|
||||||
MistralInternal: {protocol: 'https', port: '8989', host: 'CLOUDNAME'}
|
MistralInternal: {protocol: 'https', port: '8989', host: 'CLOUDNAME'}
|
||||||
MistralPublic: {protocol: 'https', port: '13989', host: 'CLOUDNAME'}
|
MistralPublic: {protocol: 'https', port: '13989', host: 'CLOUDNAME'}
|
||||||
@ -501,6 +504,7 @@ environments:
|
|||||||
ManilaAdmin: {protocol: http, port: '8786', host: IP_ADDRESS}
|
ManilaAdmin: {protocol: http, port: '8786', host: IP_ADDRESS}
|
||||||
ManilaInternal: {protocol: http, port: '8786', host: IP_ADDRESS}
|
ManilaInternal: {protocol: http, port: '8786', host: IP_ADDRESS}
|
||||||
ManilaPublic: {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}
|
MistralAdmin: {protocol: http, port: '8989', host: IP_ADDRESS}
|
||||||
MistralInternal: {protocol: http, port: '8989', host: IP_ADDRESS}
|
MistralInternal: {protocol: http, port: '8989', host: IP_ADDRESS}
|
||||||
MistralPublic: {protocol: http, port: '8989', host: IP_ADDRESS}
|
MistralPublic: {protocol: http, port: '8989', host: IP_ADDRESS}
|
||||||
@ -540,4 +544,3 @@ environments:
|
|||||||
ZaqarWebSocketInternal: {protocol: ws, port: '9000', host: IP_ADDRESS}
|
ZaqarWebSocketInternal: {protocol: ws, port: '9000', host: IP_ADDRESS}
|
||||||
ZaqarWebSocketPublic: {protocol: ws, port: '9000', host: IP_ADDRESS}
|
ZaqarWebSocketPublic: {protocol: ws, port: '9000', host: IP_ADDRESS}
|
||||||
ZaqarWebSocketUIConfig: {protocol: ws, port: '3000', host: IP_ADDRESS}
|
ZaqarWebSocketUIConfig: {protocol: ws, port: '3000', host: IP_ADDRESS}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user