Remove glusterfs dependency from stacklight
Change-Id: I755767250ffc2c4524340b430faf002f400bb8b2
diff --git a/classes/cluster/sl-k8s-calico/stacklight/init.yml b/classes/cluster/sl-k8s-calico/stacklight/init.yml
index 3237575..2d4dc23 100644
--- a/classes/cluster/sl-k8s-calico/stacklight/init.yml
+++ b/classes/cluster/sl-k8s-calico/stacklight/init.yml
@@ -15,9 +15,6 @@
stacklight_monitor_node02_address: 172.16.10.108
stacklight_monitor_node03_address: 172.16.10.109
- # Glusterfs
- glusterfs_service_host: ${_param:stacklight_monitor_address}
-
# Prometheus
prometheus_control_address: ${_param:stacklight_monitor_address}
diff --git a/classes/cluster/sl-k8s-calico/stacklight/server.yml b/classes/cluster/sl-k8s-calico/stacklight/server.yml
index dae5452..82ca05d 100644
--- a/classes/cluster/sl-k8s-calico/stacklight/server.yml
+++ b/classes/cluster/sl-k8s-calico/stacklight/server.yml
@@ -2,7 +2,6 @@
- system.docker.host
- system.linux.system.repo.influxdb
- system.linux.system.repo.tcp_elastic
-- system.linux.system.repo.glusterfs
# Needed to install Galera packages
- system.linux.system.repo.mcp.openstack
- system.elasticsearch.server.cluster
@@ -12,10 +11,6 @@
- system.haproxy.proxy.listen.stacklight.kibana
- system.haproxy.proxy.listen.stacklight.influxdb_relay
- service.haproxy.proxy.single
-- system.glusterfs.client.cluster
-- system.glusterfs.client.volume.prometheus
-- system.glusterfs.server.cluster
-- system.glusterfs.server.volume.prometheus
- system.galera.server.cluster
- system.galera.server.database.grafana
- system.influxdb.relay.cluster
diff --git a/classes/cluster/sl-k8s-contrail/stacklight/init.yml b/classes/cluster/sl-k8s-contrail/stacklight/init.yml
index f57c228..12a5c01 100644
--- a/classes/cluster/sl-k8s-contrail/stacklight/init.yml
+++ b/classes/cluster/sl-k8s-contrail/stacklight/init.yml
@@ -14,8 +14,6 @@
stacklight_node01_address: 172.16.10.107
stacklight_node02_address: 172.16.10.108
stacklight_node03_address: 172.16.10.109
- # GlusterFS
- glusterfs_service_host: ${_param:stacklight_monitor_address}
# Prometheus
prometheus_control_address: ${_param:stacklight_monitor_address}
diff --git a/classes/cluster/sl-k8s-contrail/stacklight/server.yml b/classes/cluster/sl-k8s-contrail/stacklight/server.yml
index 2890d05..99142b0 100644
--- a/classes/cluster/sl-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/sl-k8s-contrail/stacklight/server.yml
@@ -1,7 +1,6 @@
classes:
- system.linux.system.repo.influxdb
- system.linux.system.repo.tcp_elastic
-- system.linux.system.repo.glusterfs
# Needed to install Galera packages
- system.linux.system.repo.mcp.openstack
- system.docker.host
@@ -14,8 +13,6 @@
- service.haproxy.proxy.single
- system.galera.server.cluster
- system.galera.server.database.grafana
-- system.glusterfs.client.cluster
-- system.glusterfs.client.volume.prometheus
- system.influxdb.relay.cluster
- system.influxdb.server.single
- system.influxdb.database.prometheus
diff --git a/classes/cluster/sl-os-contrail/openstack/control.yml b/classes/cluster/sl-os-contrail/openstack/control.yml
index c2e88c4..8ebb874 100755
--- a/classes/cluster/sl-os-contrail/openstack/control.yml
+++ b/classes/cluster/sl-os-contrail/openstack/control.yml
@@ -12,7 +12,6 @@
- system.keystone.server.cluster
- system.glusterfs.server.volume.glance
- system.glusterfs.server.volume.keystone
-- system.glusterfs.server.volume.prometheus
- system.glusterfs.server.cluster
- system.glusterfs.client.cluster
- system.glusterfs.client.volume.glance
diff --git a/classes/cluster/sl-os-contrail/stacklight/server.yml b/classes/cluster/sl-os-contrail/stacklight/server.yml
index 25ca9cd..4214646 100755
--- a/classes/cluster/sl-os-contrail/stacklight/server.yml
+++ b/classes/cluster/sl-os-contrail/stacklight/server.yml
@@ -1,11 +1,8 @@
classes:
- system.docker.host
-- system.linux.system.repo.glusterfs
- system.linux.system.repo.influxdb
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.tcp_elastic
-- system.glusterfs.client.cluster
-- system.glusterfs.client.volume.prometheus
- system.elasticsearch.server.cluster
- system.elasticsearch.server.curator
- system.kibana.server.single
@@ -52,10 +49,6 @@
docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
docker_image_grafana: grafana/grafana:4.3.2
- prometheus_glusterfs_service_host: ${_param:openstack_control_address}
- glusterfs_node01_address: ${_param:openstack_control_node01_address}
- glusterfs_node02_address: ${_param:openstack_control_node02_address}
- glusterfs_node03_address: ${_param:openstack_control_node03_address}
grafana_admin_password: admin
grafana_database_type: mysql
grafana_database_host: ${_param:cluster_vip_address}
diff --git a/classes/cluster/sl-os-ovs/stacklight/init.yml b/classes/cluster/sl-os-ovs/stacklight/init.yml
index 3e56adb..2449e44 100644
--- a/classes/cluster/sl-os-ovs/stacklight/init.yml
+++ b/classes/cluster/sl-os-ovs/stacklight/init.yml
@@ -16,8 +16,6 @@
stacklight_monitor_node03_address: 172.16.10.109
salt_minion_ca_host: cfg01.${_param:cluster_domain}
salt_minion_ca_authority: salt_master_ca
- # Glusterfs
- glusterfs_service_host: ${_param:stacklight_monitor_address}
# Prometheus
prometheus_control_address: ${_param:stacklight_monitor_address}
diff --git a/classes/cluster/sl-os-ovs/stacklight/server.yml b/classes/cluster/sl-os-ovs/stacklight/server.yml
index 5d3b8b1..916f1bf 100644
--- a/classes/cluster/sl-os-ovs/stacklight/server.yml
+++ b/classes/cluster/sl-os-ovs/stacklight/server.yml
@@ -10,8 +10,6 @@
- system.haproxy.proxy.listen.stacklight.kibana
- system.haproxy.proxy.listen.stacklight.influxdb_relay
- service.haproxy.proxy.single
-- system.glusterfs.client.cluster
-- system.glusterfs.client.volume.prometheus
- system.galera.server.cluster
- system.galera.server.database.grafana
- system.influxdb.relay.cluster
@@ -66,10 +64,6 @@
influxdb_admin_password: password
influxdb_stacklight_password: lmapass
openstack_version: newton
- prometheus_glusterfs_service_host: ${_param:openstack_control_address}
- glusterfs_node01_address: ${_param:openstack_control_node01_address}
- glusterfs_node02_address: ${_param:openstack_control_node02_address}
- glusterfs_node03_address: ${_param:openstack_control_node03_address}
remote_collector_telegraf_host: monitoring_remote_agent
linux:
network:
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/init.yml b/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/init.yml
index a9e7f7b..5bdbb9a 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/init.yml
@@ -10,7 +10,6 @@
- system.glusterfs.client.volume.mysql
- system.glusterfs.client.volume.openldap
- system.glusterfs.client.volume.postgresql
- - system.glusterfs.client.volume.prometheus
- system.glusterfs.client.volume.pushkin
- system.glusterfs.client.volume.registry
- system.glusterfs.client.volume.rundeck
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/cicd/gluster.yml b/classes/cluster/virtual-mcp-ocata-cicd/cicd/gluster.yml
index 47cd942..082902e 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/cicd/gluster.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/cicd/gluster.yml
@@ -9,7 +9,6 @@
- system.glusterfs.server.volume.mysql
- system.glusterfs.server.volume.openldap
- system.glusterfs.server.volume.postgresql
- - system.glusterfs.server.volume.prometheus
- system.glusterfs.server.volume.pushkin
- system.glusterfs.server.volume.registry
- system.glusterfs.server.volume.rundeck
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml b/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml
index 4fb5eaa..dbc3464 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml
@@ -14,7 +14,6 @@
- system.glusterfs.client.volume.keystone
- system.glusterfs.server.volume.glance
- system.glusterfs.server.volume.keystone
-- system.glusterfs.server.volume.prometheus
- system.glusterfs.server.cluster
- system.glance.control.cluster
- system.nova.control.cluster
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-dvr/stacklight/server.yml
index bdc2c09..555f176 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/stacklight/server.yml
@@ -1,6 +1,5 @@
classes:
- system.docker.host
-- system.linux.system.repo.glusterfs
- system.linux.system.repo.influxdb
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.tcp_elastic
@@ -8,8 +7,6 @@
- system.heka.remote_collector.input.amqp
- system.heka.remote_collector.output.elasticsearch
- system.heka.remote_collector.output.telegraf
-- system.glusterfs.client.cluster
-- system.glusterfs.client.volume.prometheus
- system.elasticsearch.server.cluster
- system.elasticsearch.server.curator
- system.kibana.server.single
@@ -54,10 +51,6 @@
docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
docker_image_grafana: grafana/grafana:4.3.2
- prometheus_glusterfs_service_host: ${_param:openstack_control_address}
- glusterfs_node01_address: ${_param:openstack_control_node01_address}
- glusterfs_node02_address: ${_param:openstack_control_node02_address}
- glusterfs_node03_address: ${_param:openstack_control_node03_address}
influxdb_port: 8086
influxdb_admin_password: password
influxdb_stacklight_password: lmapass
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml b/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
index cc036af..da8143e 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
@@ -14,7 +14,6 @@
- system.glusterfs.client.volume.keystone
- system.glusterfs.server.volume.glance
- system.glusterfs.server.volume.keystone
-- system.glusterfs.server.volume.prometheus
- system.glusterfs.server.cluster
- system.glance.control.cluster
- system.nova.control.cluster
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-ovs/stacklight/server.yml
index 398c722..25eede2 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/stacklight/server.yml
@@ -1,6 +1,5 @@
classes:
- system.docker.host
-- system.linux.system.repo.glusterfs
- system.linux.system.repo.influxdb
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.tcp_elastic
@@ -8,8 +7,6 @@
- system.heka.remote_collector.input.amqp
- system.heka.remote_collector.output.elasticsearch
- system.heka.remote_collector.output.telegraf
-- system.glusterfs.client.cluster
-- system.glusterfs.client.volume.prometheus
- system.elasticsearch.server.cluster
- system.elasticsearch.server.curator
- system.kibana.server.single
@@ -54,10 +51,6 @@
docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
docker_image_grafana: grafana/grafana:4.3.2
- prometheus_glusterfs_service_host: ${_param:openstack_control_address}
- glusterfs_node01_address: ${_param:openstack_control_node01_address}
- glusterfs_node02_address: ${_param:openstack_control_node02_address}
- glusterfs_node03_address: ${_param:openstack_control_node03_address}
influxdb_port: 8086
influxdb_admin_password: password
influxdb_stacklight_password: lmapass
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
index 8869a18..150cf5d 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
@@ -12,7 +12,6 @@
- system.keystone.server.cluster
- system.glusterfs.server.volume.glance
- system.glusterfs.server.volume.keystone
-- system.glusterfs.server.volume.prometheus
- 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 693a7cb..b2ba726 100755
--- a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
@@ -1,6 +1,5 @@
classes:
- system.docker.host
-- system.linux.system.repo.glusterfs
- system.linux.system.repo.influxdb
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.tcp_elastic
@@ -8,8 +7,6 @@
- system.heka.remote_collector.input.amqp
- system.heka.remote_collector.output.elasticsearch
- system.heka.remote_collector.output.telegraf
-- system.glusterfs.client.cluster
-- system.glusterfs.client.volume.prometheus
- system.elasticsearch.server.cluster
- system.elasticsearch.server.curator
- system.kibana.server.single
@@ -54,10 +51,6 @@
docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
docker_image_grafana: grafana/grafana:4.3.2
- prometheus_glusterfs_service_host: ${_param:openstack_control_address}
- glusterfs_node01_address: ${_param:openstack_control_node01_address}
- glusterfs_node02_address: ${_param:openstack_control_node02_address}
- glusterfs_node03_address: ${_param:openstack_control_node03_address}
influxdb_port: 8086
influxdb_admin_password: password
influxdb_stacklight_password: lmapass
diff --git a/classes/cluster/virtual-mcp11-dvr/openstack/control.yml b/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
index 2403464..12431c9 100644
--- a/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
@@ -14,7 +14,6 @@
- system.glusterfs.client.volume.keystone
- system.glusterfs.server.volume.glance
- system.glusterfs.server.volume.keystone
-- system.glusterfs.server.volume.prometheus
- 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 9e47cb3..5dcfd88 100644
--- a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
@@ -1,6 +1,5 @@
classes:
- system.docker.host
-- system.linux.system.repo.glusterfs
- system.linux.system.repo.influxdb
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.tcp_elastic
@@ -8,8 +7,6 @@
- system.heka.remote_collector.input.amqp
- system.heka.remote_collector.output.elasticsearch
- system.heka.remote_collector.output.telegraf
-- system.glusterfs.client.cluster
-- system.glusterfs.client.volume.prometheus
- system.elasticsearch.server.cluster
- system.elasticsearch.server.curator
- system.kibana.server.single
@@ -54,10 +51,6 @@
docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
docker_image_grafana: grafana/grafana:4.3.2
- prometheus_glusterfs_service_host: ${_param:openstack_control_address}
- glusterfs_node01_address: ${_param:openstack_control_node01_address}
- glusterfs_node02_address: ${_param:openstack_control_node02_address}
- glusterfs_node03_address: ${_param:openstack_control_node03_address}
influxdb_port: 8086
influxdb_admin_password: password
influxdb_stacklight_password: lmapass
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/init.yml
index f755342..adcdb35 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/init.yml
@@ -8,9 +8,6 @@
stacklight_node02_address: 172.16.10.108
stacklight_node03_address: 172.16.10.109
- # Glusterfs
- glusterfs_service_host: ${_param:stacklight_address}
-
# Prometheus
prometheus_control_address: ${_param:stacklight_address}
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 a54bad3..6bc2c7e 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
@@ -9,10 +9,6 @@
- system.haproxy.proxy.listen.stacklight.elasticsearch
- system.haproxy.proxy.listen.stacklight.kibana
- service.haproxy.proxy.single
-- system.glusterfs.client.cluster
-- system.glusterfs.client.volume.prometheus
-- system.glusterfs.server.cluster
-- system.glusterfs.server.volume.prometheus
- system.galera.server.cluster
- system.galera.server.database.grafana
- system.salt.minion.cert.prometheus_server
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml
index 243a614..daf0cdc 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml
@@ -8,9 +8,6 @@
stacklight_node02_address: 172.16.10.108
stacklight_node03_address: 172.16.10.109
- # Glusterfs
- glusterfs_service_host: ${_param:stacklight_monitor_address}
-
# Prometheus
prometheus_control_address: ${_param:stacklight_monitor_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
index 442b8d5..3d384dd 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
@@ -11,10 +11,6 @@
- system.haproxy.proxy.listen.stacklight.influxdb_relay
- system.haproxy.proxy.listen.stacklight.kibana
- service.haproxy.proxy.single
-- system.glusterfs.client.cluster
-- system.glusterfs.client.volume.prometheus
-- system.glusterfs.server.cluster
-- system.glusterfs.server.volume.prometheus
- system.influxdb.relay.cluster
- system.galera.server.cluster
- system.galera.server.database.grafana
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml
index 4b37345..832bcdd 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml
@@ -7,8 +7,6 @@
stacklight_node01_address: 172.16.10.107
stacklight_node02_address: 172.16.10.108
stacklight_node03_address: 172.16.10.109
- # GlusterFS
- glusterfs_service_host: ${_param:stacklight_monitor_address}
# Prometheus
prometheus_control_address: ${_param:stacklight_monitor_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
index d434b72..437c93f 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
@@ -13,10 +13,6 @@
- service.haproxy.proxy.single
- system.galera.server.cluster
- system.galera.server.database.grafana
-- system.glusterfs.client.cluster
-- system.glusterfs.client.volume.prometheus
-- system.glusterfs.server.cluster
-- system.glusterfs.server.volume.prometheus
- system.influxdb.relay.cluster
- system.influxdb.server.single
- system.influxdb.database.prometheus