Expose grafana, dashboard and mgr port parameters

ceph-ansible computes facts to run ceph services on the proper
ip addresses, using default ports.
Due to "how ansible gather the instance facts" this can result
in an issue when haproxy services are included in the overcloud
deployment, because in a standalone environment, frontend and
backend ip addresses can be the same.
The purpose of this patch is to expose the port parameter of the
involved ceph services, making them configurable.
By doing this, we should be able to properly customize haproxy
with the default config provided by puppet manifests, customizing
the backend server address/ports in the job definitions.

Change-Id: I5b3b4b96a60c75826a24019932b368a9d2413385
This commit is contained in:
Francesco Pantano 2020-05-08 13:50:32 +02:00 committed by Michele Baldessari
parent 0b992342dc
commit 91f94980fc
3 changed files with 14 additions and 4 deletions

View File

@ -71,6 +71,8 @@ parameter_defaults:
CephPoolDefaultPgNum: 32
CephPoolDefaultSize: 1
CephEnableDashboard: true
CephDashboardPort: 8445
GrafanaDashboardPort: 3200
CephAnsibleRepo: "tripleo-centos-ceph-nautilus"
CinderRbdExtraPools: altrbd,pool2,pool3
CephPools:

View File

@ -46,6 +46,10 @@ parameters:
default: ''
description: ceph dashboards templates built for grafana
type: string
GrafanaDashboardPort:
type: number
default: 3100
description: Parameter that defines the ceph grafana port.
GrafanaDataSource:
default: 'Dashboard'
description: Grafana datasource
@ -88,7 +92,7 @@ resources:
grafana_dashboards_path: {get_param: GrafanaDashboardsPath}
grafana_datasource: {get_param: GrafanaDataSource}
grafana_plugins: {get_param: GrafanaPlugins}
grafana_port: 3100
grafana_port: {get_param: GrafanaDashboardPort}
prometheus_container_image: {get_param: PrometheusContainerImage}
prometheus_port: 9092
alertmanager_container_image: {get_param: AlertManagerContainerImage}
@ -101,7 +105,7 @@ outputs:
firewall_rules:
'123 ceph_dashboard':
dport:
- 3100
- {get_param: GrafanaDashboardPort}
- 9090
- 9092
- 9093

View File

@ -38,6 +38,10 @@ parameters:
type: boolean
default: false
description: Parameter used to trigger the dashboard deployment.
CephDashboardPort:
type: number
default: 8444
description: Parameter that defines the ceph dashboard port.
CephDashboardAdminRO:
type: boolean
default: true
@ -78,7 +82,7 @@ resources:
dashboard_rgw_api_port: {get_param: [EndpointMap, CephRgwInternal, port]}
dashboard_rgw_api_scheme: {get_param: [EndpointMap, CephRgwInternal, protocol]}
dashboard_rgw_api_no_ssl_verify: false
dashboard_port: 8444
dashboard_port: {get_param: CephDashboardPort}
dashboard_frontend_vip: {get_param: [EndpointMap, CephDashboardInternal, host]}
dashboard_admin_user_ro: {get_param: CephDashboardAdminRO}
@ -94,7 +98,7 @@ outputs:
- - '6800-7300'
- if:
- dashboard_enabled
- - '8444'
- - {get_param: CephDashboardPort}
- []
upgrade_tasks: []
puppet_config: