Merge "Expose grafana, dashboard and mgr port parameters"
This commit is contained in:
commit
dcef7c2c7e
|
@ -71,6 +71,8 @@ parameter_defaults:
|
||||||
CephPoolDefaultPgNum: 32
|
CephPoolDefaultPgNum: 32
|
||||||
CephPoolDefaultSize: 1
|
CephPoolDefaultSize: 1
|
||||||
CephEnableDashboard: true
|
CephEnableDashboard: true
|
||||||
|
CephDashboardPort: 8445
|
||||||
|
GrafanaDashboardPort: 3200
|
||||||
CephAnsibleRepo: "tripleo-centos-ceph-nautilus"
|
CephAnsibleRepo: "tripleo-centos-ceph-nautilus"
|
||||||
CinderRbdExtraPools: altrbd,pool2,pool3
|
CinderRbdExtraPools: altrbd,pool2,pool3
|
||||||
CephPools:
|
CephPools:
|
||||||
|
|
|
@ -46,6 +46,10 @@ parameters:
|
||||||
default: ''
|
default: ''
|
||||||
description: ceph dashboards templates built for grafana
|
description: ceph dashboards templates built for grafana
|
||||||
type: string
|
type: string
|
||||||
|
GrafanaDashboardPort:
|
||||||
|
type: number
|
||||||
|
default: 3100
|
||||||
|
description: Parameter that defines the ceph grafana port.
|
||||||
GrafanaDataSource:
|
GrafanaDataSource:
|
||||||
default: 'Dashboard'
|
default: 'Dashboard'
|
||||||
description: Grafana datasource
|
description: Grafana datasource
|
||||||
|
@ -88,7 +92,7 @@ resources:
|
||||||
grafana_dashboards_path: {get_param: GrafanaDashboardsPath}
|
grafana_dashboards_path: {get_param: GrafanaDashboardsPath}
|
||||||
grafana_datasource: {get_param: GrafanaDataSource}
|
grafana_datasource: {get_param: GrafanaDataSource}
|
||||||
grafana_plugins: {get_param: GrafanaPlugins}
|
grafana_plugins: {get_param: GrafanaPlugins}
|
||||||
grafana_port: 3100
|
grafana_port: {get_param: GrafanaDashboardPort}
|
||||||
prometheus_container_image: {get_param: PrometheusContainerImage}
|
prometheus_container_image: {get_param: PrometheusContainerImage}
|
||||||
prometheus_port: 9092
|
prometheus_port: 9092
|
||||||
alertmanager_container_image: {get_param: AlertManagerContainerImage}
|
alertmanager_container_image: {get_param: AlertManagerContainerImage}
|
||||||
|
@ -101,7 +105,7 @@ outputs:
|
||||||
firewall_rules:
|
firewall_rules:
|
||||||
'123 ceph_dashboard':
|
'123 ceph_dashboard':
|
||||||
dport:
|
dport:
|
||||||
- 3100
|
- {get_param: GrafanaDashboardPort}
|
||||||
- 9090
|
- 9090
|
||||||
- 9092
|
- 9092
|
||||||
- 9093
|
- 9093
|
||||||
|
|
|
@ -38,6 +38,10 @@ parameters:
|
||||||
type: boolean
|
type: boolean
|
||||||
default: false
|
default: false
|
||||||
description: Parameter used to trigger the dashboard deployment.
|
description: Parameter used to trigger the dashboard deployment.
|
||||||
|
CephDashboardPort:
|
||||||
|
type: number
|
||||||
|
default: 8444
|
||||||
|
description: Parameter that defines the ceph dashboard port.
|
||||||
CephDashboardAdminRO:
|
CephDashboardAdminRO:
|
||||||
type: boolean
|
type: boolean
|
||||||
default: true
|
default: true
|
||||||
|
@ -78,7 +82,7 @@ resources:
|
||||||
dashboard_rgw_api_port: {get_param: [EndpointMap, CephRgwInternal, port]}
|
dashboard_rgw_api_port: {get_param: [EndpointMap, CephRgwInternal, port]}
|
||||||
dashboard_rgw_api_scheme: {get_param: [EndpointMap, CephRgwInternal, protocol]}
|
dashboard_rgw_api_scheme: {get_param: [EndpointMap, CephRgwInternal, protocol]}
|
||||||
dashboard_rgw_api_no_ssl_verify: false
|
dashboard_rgw_api_no_ssl_verify: false
|
||||||
dashboard_port: 8444
|
dashboard_port: {get_param: CephDashboardPort}
|
||||||
dashboard_frontend_vip: {get_param: [EndpointMap, CephDashboardInternal, host]}
|
dashboard_frontend_vip: {get_param: [EndpointMap, CephDashboardInternal, host]}
|
||||||
dashboard_admin_user_ro: {get_param: CephDashboardAdminRO}
|
dashboard_admin_user_ro: {get_param: CephDashboardAdminRO}
|
||||||
|
|
||||||
|
@ -94,7 +98,7 @@ outputs:
|
||||||
- - '6800-7300'
|
- - '6800-7300'
|
||||||
- if:
|
- if:
|
||||||
- dashboard_enabled
|
- dashboard_enabled
|
||||||
- - '8444'
|
- - {get_param: CephDashboardPort}
|
||||||
- []
|
- []
|
||||||
upgrade_tasks: []
|
upgrade_tasks: []
|
||||||
puppet_config:
|
puppet_config:
|
||||||
|
|
Loading…
Reference in New Issue