Enable Grafana GlusterFS volume
Change-Id: Ia2da2d1aa1b0e250b6070aa108d141b14804642f
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
index 9baa3d4..3f48fab 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
@@ -13,6 +13,7 @@
- system.glusterfs.server.volume.glance
- system.glusterfs.server.volume.keystone
- system.glusterfs.server.volume.prometheus
+- system.glusterfs.server.volume.grafana
- system.glusterfs.server.cluster
- system.glusterfs.client.cluster
- system.glusterfs.client.volume.glance
diff --git a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
index 07673ba..51dcfd4 100755
--- a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
@@ -9,6 +9,7 @@
- system.heka.remote_collector.output.elasticsearch
- system.glusterfs.client.cluster
- system.glusterfs.client.volume.prometheus
+- system.glusterfs.client.volume.grafana
- system.elasticsearch.server.cluster
- system.elasticsearch.server.curator
- system.kibana.server.single
@@ -46,6 +47,7 @@
grafana_database_type: mysql
grafana_database_host: ${_param:openstack_database_address}
grafana_database_password: ${_param:mysql_grafana_password}
+ docker_grafana_replicas: 3
docker_image_alertmanager: mirantis/alertmanager:latest
docker_image_pushgateway: mirantis/pushgateway:latest
docker_image_prometheus: mirantis/prometheus:latest
diff --git a/classes/cluster/virtual-mcp11-dvr/openstack/control.yml b/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
index f06e83d..853a1b4 100644
--- a/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
@@ -15,6 +15,7 @@
- system.glusterfs.server.volume.glance
- system.glusterfs.server.volume.keystone
- system.glusterfs.server.volume.prometheus
+- system.glusterfs.server.volume.grafana
- system.glusterfs.server.cluster
- system.glance.control.cluster
- system.nova.control.cluster
diff --git a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
index 9d9af9a..769492d 100644
--- a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
@@ -9,6 +9,7 @@
- system.heka.remote_collector.output.elasticsearch
- system.glusterfs.client.cluster
- system.glusterfs.client.volume.prometheus
+- system.glusterfs.client.volume.grafana
- system.elasticsearch.server.cluster
- system.elasticsearch.server.curator
- system.kibana.server.single
@@ -46,6 +47,7 @@
grafana_database_type: mysql
grafana_database_host: ${_param:openstack_database_address}
grafana_database_password: ${_param:mysql_grafana_password}
+ docker_grafana_replicas: 3
docker_image_alertmanager: mirantis/alertmanager:latest
docker_image_pushgateway: mirantis/pushgateway:latest
docker_image_prometheus: mirantis/prometheus:latest
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
index 6f944b7..be5d650 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
@@ -11,8 +11,10 @@
- service.haproxy.proxy.single
- system.glusterfs.client.cluster
- system.glusterfs.client.volume.prometheus
+- system.glusterfs.client.volume.grafana
- system.glusterfs.server.cluster
- system.glusterfs.server.volume.prometheus
+- system.glusterfs.server.volume.grafana
- system.galera.server.cluster
- system.galera.server.database.grafana
- system.salt.minion.cert.prometheus_server
@@ -35,6 +37,7 @@
docker_image_remote_agent: mirantis/telegraf:latest
docker_image_remote_storage_adapter: mirantis/remote_storage_adapter:latest
docker_image_grafana: grafana/grafana:latest
+ docker_grafana_replicas: 3
grafana_admin_password: admin
keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
keepalived_prometheus_vip_password: password
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
index 131aa0d..e68a624 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
@@ -13,8 +13,10 @@
- service.haproxy.proxy.single
- system.glusterfs.client.cluster
- system.glusterfs.client.volume.prometheus
+- system.glusterfs.client.volume.grafana
- system.glusterfs.server.cluster
- system.glusterfs.server.volume.prometheus
+- system.glusterfs.server.volume.grafana
- system.galera.server.cluster
- system.galera.server.database.grafana
- system.influxdb.server.single
@@ -40,6 +42,7 @@
docker_image_remote_agent: mirantis/telegraf:latest
docker_image_remote_storage_adapter: mirantis/remote_storage_adapter:latest
docker_image_grafana: grafana/grafana:latest
+ docker_grafana_replicas: 3
grafana_admin_password: admin
keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
keepalived_prometheus_vip_password: password
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
index 401fc79..5e9d181 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
@@ -15,8 +15,10 @@
- system.galera.server.database.grafana
- system.glusterfs.client.cluster
- system.glusterfs.client.volume.prometheus
+- system.glusterfs.client.volume.grafana
- system.glusterfs.server.cluster
- system.glusterfs.server.volume.prometheus
+- system.glusterfs.server.volume.grafana
- system.influxdb.server.single
- system.influxdb.database.stacklight
- system.salt.minion.cert.prometheus_server
@@ -40,6 +42,7 @@
docker_image_remote_agent: mirantis/telegraf:latest
docker_image_remote_storage_adapter: mirantis/remote_storage_adapter:latest
docker_image_grafana: grafana/grafana:latest
+ docker_grafana_replicas: 3
grafana_admin_password: admin
keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
keepalived_prometheus_vip_password: password
diff --git a/classes/system b/classes/system
index c93eae7..9f2c559 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit c93eae79862a87c455680354f8d0d9a59801e257
+Subproject commit 9f2c5596c833df0f9c72033bd6d6ae39d5f2fa81