openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Add CephGrafanaNetwork to the list of the services 

As per documentation, one of the steps to have the
haproxy endpoint available is to define the service
network that will be consumed to build the endpoint
attributes.
To match these requirements and maintain compatibility
with the existing services, we're also moving the
grafana port to 3100.

Change-Id: Icaf7d998c9cf21b8f00d381cec70a88ea50b6659
This commit is contained in:
fpantano 2019-07-24 16:15:14 +02:00
parent a407d4f5da
commit 1fba084fed
No known key found for this signature in database
GPG Key ID: 799868C47301D458
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deployment/ceph-ansible/ceph-grafana.yaml
View File

@ -87,6 +87,7 @@ resources:
grafana_dashboards_path: {get_param: GrafanaDashboardsPath}
grafana_datasource: {get_param: GrafanaDataSource}
grafana_plugins: {get_param: GrafanaPlugins}
grafana_port: 3100
prometheus_container_image: {get_param: PrometheusContainerImage}
alertmanager_container_image: {get_param: AlertManagerContainerImage}
node_exporter_container_image: {get_param: NodeExporterContainerImage}
@ -121,5 +122,5 @@ outputs:
map_merge:
- tripleo::ceph_dashboard::firewall_rules:
'123 ceph_dashboard':
dport: [3000,9090,9093,9094,9100]
dport: [3100,9090,9093,9094,9100]
- {}

1
network/service_net_map.j2.yaml
View File

@ -78,6 +78,7 @@ parameters:
MysqlNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
SnmpdNetwork: ctlplane
CephClusterNetwork: {{ _service_nets.get('storage_mgmt', 'ctlplane') }}
CephGrafanaNetwork: {{ _service_nets.get('storage', 'ctlplane') }}
CephMonNetwork: {{ _service_nets.get('storage', 'ctlplane') }}
CephRgwNetwork: {{ _service_nets.get('storage', 'ctlplane') }}
PublicNetwork: {{ _service_nets.get('external', 'ctlplane') }}