Merge "Add influxdb relay to ocata models"
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp-ocata-dvr/openstack/compute.yml
index 4e4a03e..3aa82c2 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/openstack/compute.yml
@@ -24,8 +24,6 @@
nova:
compute:
vncproxy_url: http://${_param:cluster_vip_address}:6080
- notification:
- driver: messagingv2
message_queue:
members:
- host: ${_param:openstack_control_node01_address}
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/stacklight/client.yml b/classes/cluster/virtual-mcp-ocata-dvr/stacklight/client.yml
index c6bf4ac..a8f20a4 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/stacklight/client.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/stacklight/client.yml
@@ -16,7 +16,6 @@
grafana_password: ${_param:grafana_admin_password}
grafana_prometheus_address: ${_param:stacklight_monitor_address}
grafana_prometheus_port: 15010
- grafana_influxdb_host: ${_param:stacklight_monitor_node01_address}
cluster_node01_address: ${_param:stacklight_monitor_node01_address}
cluster_node02_address: ${_param:stacklight_monitor_node02_address}
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-dvr/stacklight/server.yml
index a99b73c..bdc2c09 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/stacklight/server.yml
@@ -15,8 +15,9 @@
- system.kibana.server.single
- system.haproxy.proxy.listen.stacklight.elasticsearch
- system.haproxy.proxy.listen.stacklight.kibana
-- system.haproxy.proxy.listen.stacklight.influxdb
+- system.haproxy.proxy.listen.stacklight.influxdb_relay
- service.haproxy.proxy.single
+- system.influxdb.relay.cluster
- system.influxdb.server.single
- system.influxdb.database.stacklight
- system.influxdb.database.ceilometer
@@ -37,6 +38,7 @@
keepalived_prometheus_vip_password: 'password'
keepalived_prometheus_vip_interface: ens4
cluster_vip_address: ${_param:stacklight_monitor_address}
+ cluster_local_address: ${_param:single_address}
cluster_elasticsearch_port: 9200
cluster_kibana_port: 5601
cluster_node01_hostname: mon01
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
index 876bfea..2365676 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
@@ -20,7 +20,6 @@
- system.keystone.client.service.designate
- system.mysql.client.single
- system.reclass.storage.system.openstack_control_cluster
-- system.reclass.storage.system.stacklight_server_cluster
- system.reclass.storage.system.openstack_compute_multi
- system.reclass.storage.system.openstack_gateway_single
- system.reclass.storage.system.openstack_dashboard_single
@@ -164,6 +163,10 @@
params:
mysql_cluster_role: slave
linux_system_codename: xenial
+ stacklight_server_node01:
+ classes:
+ - system.influxdb.server.single
+ - system.influxdb.database.stacklight
openstack_compute_node01:
params:
single_address: 172.16.10.105
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/init.yml b/classes/cluster/virtual-mcp-ocata-ovs/init.yml
index e9739f2..a178f05 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/init.yml
@@ -1,4 +1,6 @@
classes:
+- service.grafana.collector
+- system.heka.log_collector.single
- system.heka.log_collector.output.telegraf
- system.linux.system.repo.mcp.extra
- system.linux.system.single
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/stacklight/client.yml b/classes/cluster/virtual-mcp-ocata-ovs/stacklight/client.yml
index 44b6178..f37218a 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/stacklight/client.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/stacklight/client.yml
@@ -16,7 +16,6 @@
grafana_password: ${_param:grafana_admin_password}
grafana_prometheus_address: ${_param:stacklight_monitor_address}
grafana_prometheus_port: 15010
- grafana_influxdb_host: ${_param:stacklight_monitor_node01_address}
cluster_node01_address: ${_param:stacklight_monitor_node01_address}
cluster_node02_address: ${_param:stacklight_monitor_node02_address}
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-ovs/stacklight/server.yml
index 6f1b9e0..398c722 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/stacklight/server.yml
@@ -15,8 +15,9 @@
- system.kibana.server.single
- system.haproxy.proxy.listen.stacklight.elasticsearch
- system.haproxy.proxy.listen.stacklight.kibana
-- system.haproxy.proxy.listen.stacklight.influxdb
+- system.haproxy.proxy.listen.stacklight.influxdb_relay
- service.haproxy.proxy.single
+- system.influxdb.relay.cluster
- system.influxdb.server.single
- system.influxdb.database.stacklight
- system.influxdb.database.ceilometer
@@ -37,6 +38,7 @@
keepalived_prometheus_vip_password: 'password'
keepalived_prometheus_vip_interface: ens4
cluster_vip_address: ${_param:stacklight_monitor_address}
+ cluster_local_address: ${_param:single_address}
cluster_elasticsearch_port: 9200
cluster_kibana_port: 5601
cluster_node01_hostname: mon01
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
index efb1a16..442b8d5 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
@@ -1,31 +1,31 @@
classes:
- system.docker.host
- system.linux.system.repo.tcp_elastic
+- system.linux.system.repo.influxdb
# Needed to install Galera packages
- system.linux.system.repo.mcp.openstack
- system.elasticsearch.server.cluster
- system.elasticsearch.server.curator
- system.kibana.server.single
- system.haproxy.proxy.listen.stacklight.elasticsearch
+- 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.client.volume.influxdb
- system.glusterfs.server.cluster
- system.glusterfs.server.volume.prometheus
-- system.glusterfs.server.volume.influxdb
+- system.influxdb.relay.cluster
- system.galera.server.cluster
- system.galera.server.database.grafana
-- system.influxdb.client
-- system.influxdb.client.database.prometheus
+- system.influxdb.server.single
+- system.influxdb.database.prometheus
- system.salt.minion.cert.prometheus_server
- system.keepalived.cluster.instance.prometheus_server_vip
- system.telegraf.agent.remote
- system.prometheus.server.remote_write.docker
- system.prometheus.server.alertmanager.dns
- system.prometheus.server.target.dns
-- system.docker.swarm.stack.influxdb
- system.docker.swarm.stack.monitoring
- system.docker.swarm.stack.dashboard
- cluster.virtual-mcp11-k8s-calico.infra
@@ -33,6 +33,7 @@
_param:
cluster_vip_address: ${_param:stacklight_monitor_address}
cluster_public_host: mon
+ cluster_local_address: ${_param:single_address}
docker_image_alertmanager: docker-prod-virtual.docker.mirantis.net/openstack-docker/alertmanager:latest
docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:latest
docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:latest