Merge "Remove duplicate incomplete section"
diff --git a/classes/cluster/os_ha_contrail_40/opencontrail/control.yml b/classes/cluster/os_ha_contrail_40/opencontrail/control.yml
index 2a1b67d..f83d14b 100644
--- a/classes/cluster/os_ha_contrail_40/opencontrail/control.yml
+++ b/classes/cluster/os_ha_contrail_40/opencontrail/control.yml
@@ -16,7 +16,7 @@
- cluster.os_ha_contrail_40
parameters:
_param:
- keepalived_vip_interface: eth1
+ keepalived_vip_interface: ${_param:opencontrail_control_interface_name}
cluster_vip_address: ${_param:opencontrail_control_address}
cluster_local_address: ${_param:single_address}
cluster_node01_hostname: ntw01
@@ -27,7 +27,6 @@
cluster_node03_address: ${_param:opencontrail_control_node03_address}
opencontrail_router01_hostname: vsrx01.${_param:cluster_domain}
opencontrail_router01_address: 172.16.10.131
- opencontrail_control_interface_name: eth1
linux:
network:
interface:
diff --git a/classes/cluster/os_ha_contrail_40/opencontrail/init.yml b/classes/cluster/os_ha_contrail_40/opencontrail/init.yml
index 7e1e78c..b36a3f0 100644
--- a/classes/cluster/os_ha_contrail_40/opencontrail/init.yml
+++ b/classes/cluster/os_ha_contrail_40/opencontrail/init.yml
@@ -12,6 +12,7 @@
opencontrail_control_node01_address: 172.16.10.111
opencontrail_control_node02_address: 172.16.10.112
opencontrail_control_node03_address: 172.16.10.113
+ opencontrail_control_interface_name: eth1
linux:
network:
host:
diff --git a/classes/cluster/sl_k8s_calico/stacklight/server.yml b/classes/cluster/sl_k8s_calico/stacklight/server.yml
index 201f5ee..eb979f9 100644
--- a/classes/cluster/sl_k8s_calico/stacklight/server.yml
+++ b/classes/cluster/sl_k8s_calico/stacklight/server.yml
@@ -10,16 +10,15 @@
- 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.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.galera.server.cluster
- system.galera.server.database.grafana
+- system.influxdb.relay.cluster
- system.influxdb.server.single
- system.influxdb.database.prometheus
- system.salt.minion.cert.prometheus_server
@@ -34,6 +33,7 @@
parameters:
_param:
cluster_vip_address: ${_param:stacklight_monitor_address}
+ cluster_local_address: ${_param:single_address}
cluster_public_host: mon
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
diff --git a/classes/cluster/sl_k8s_contrail/infra/config.yml b/classes/cluster/sl_k8s_contrail/infra/config.yml
index b17d297..7a47bd3 100644
--- a/classes/cluster/sl_k8s_contrail/infra/config.yml
+++ b/classes/cluster/sl_k8s_contrail/infra/config.yml
@@ -85,12 +85,12 @@
stacklight_monitor_node01:
expression: <<node_hostname>>__equals__mon01
cluster_param:
- stacklight_monitor_node03_address:
+ stacklight_monitor_node01_address:
value_template: <<node_control_ip>>
stacklight_monitor_node02:
expression: <<node_hostname>>__equals__mon02
cluster_param:
- stacklight_monitor_node03_address:
+ stacklight_monitor_node02_address:
value_template: <<node_control_ip>>
stacklight_monitor_node03:
expression: <<node_hostname>>__equals__mon03
diff --git a/classes/cluster/sl_k8s_contrail/stacklight/server.yml b/classes/cluster/sl_k8s_contrail/stacklight/server.yml
index 89ae877..cc485cb 100644
--- a/classes/cluster/sl_k8s_contrail/stacklight/server.yml
+++ b/classes/cluster/sl_k8s_contrail/stacklight/server.yml
@@ -10,12 +10,13 @@
- 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.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
- system.salt.minion.cert.prometheus_server
@@ -31,6 +32,7 @@
_param:
cluster_public_host: mon
cluster_vip_address: ${_param:stacklight_monitor_address}
+ 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
diff --git a/classes/cluster/sl_os_contrail/stacklight/server.yml b/classes/cluster/sl_os_contrail/stacklight/server.yml
index 819404c..243ec03 100755
--- a/classes/cluster/sl_os_contrail/stacklight/server.yml
+++ b/classes/cluster/sl_os_contrail/stacklight/server.yml
@@ -11,8 +11,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.prometheus
- system.keepalived.cluster.instance.prometheus_server_vip
@@ -31,6 +32,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: ${_param:stacklight_monitor_node01_hostname}
@@ -80,4 +82,4 @@
elasticsearch:
server:
heap:
- size: 1
\ No newline at end of file
+ size: 1
diff --git a/classes/cluster/sl_os_ovs/stacklight/client.yml b/classes/cluster/sl_os_ovs/stacklight/client.yml
index 4d473ac..40a4c38 100644
--- a/classes/cluster/sl_os_ovs/stacklight/client.yml
+++ b/classes/cluster/sl_os_ovs/stacklight/client.yml
@@ -14,4 +14,3 @@
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}
diff --git a/classes/cluster/sl_os_ovs/stacklight/server.yml b/classes/cluster/sl_os_ovs/stacklight/server.yml
index e5e2cc6..c48b77c 100644
--- a/classes/cluster/sl_os_ovs/stacklight/server.yml
+++ b/classes/cluster/sl_os_ovs/stacklight/server.yml
@@ -8,12 +8,13 @@
- 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.glusterfs.client.cluster
- system.glusterfs.client.volume.prometheus
- system.galera.server.cluster
- system.galera.server.database.grafana
+- system.influxdb.relay.cluster
- system.influxdb.server.single
- system.influxdb.database.prometheus
- system.salt.minion.cert.prometheus_server
@@ -35,6 +36,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_grafana_port: 3000
@@ -86,4 +88,4 @@
cluster:
instance:
VIP:
- enabled: false
\ No newline at end of file
+ enabled: false
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml b/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
index d3a6dcd..eba6c65 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
@@ -123,12 +123,12 @@
stacklight_monitor_node01:
expression: <<node_hostname>>__equals__mon01
cluster_param:
- stacklight_monitor_node03_address:
+ stacklight_monitor_node01_address:
value_template: <<node_control_ip>>
stacklight_monitor_node02:
expression: <<node_hostname>>__equals__mon02
cluster_param:
- stacklight_monitor_node03_address:
+ stacklight_monitor_node02_address:
value_template: <<node_control_ip>>
stacklight_monitor_node03:
expression: <<node_hostname>>__equals__mon03
@@ -185,4 +185,4 @@
classes:
- cluster.virtual-mcp-ocata-dvr.openstack.proxy
params:
- linux_system_codename: xenial
\ No newline at end of file
+ linux_system_codename: xenial
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
index ab81805..876bfea 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
@@ -124,12 +124,12 @@
stacklight_monitor_node01:
expression: <<node_hostname>>__equals__mon01
cluster_param:
- stacklight_monitor_node03_address:
+ stacklight_monitor_node01_address:
value_template: <<node_control_ip>>
stacklight_monitor_node02:
expression: <<node_hostname>>__equals__mon02
cluster_param:
- stacklight_monitor_node03_address:
+ stacklight_monitor_node02_address:
value_template: <<node_control_ip>>
stacklight_monitor_node03:
expression: <<node_hostname>>__equals__mon03
@@ -182,4 +182,4 @@
classes:
- cluster.virtual-mcp-ocata-ovs.openstack.proxy
params:
- linux_system_codename: xenial
\ No newline at end of file
+ linux_system_codename: xenial
diff --git a/classes/cluster/virtual-mcp05-dvr/infra/config.yml b/classes/cluster/virtual-mcp05-dvr/infra/config.yml
index 185739a..cfcb185 100644
--- a/classes/cluster/virtual-mcp05-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp05-dvr/infra/config.yml
@@ -117,12 +117,12 @@
stacklight_monitor_node01:
expression: <<node_hostname>>__equals__mon01
cluster_param:
- stacklight_monitor_node03_address:
+ stacklight_monitor_node01_address:
value_template: <<node_control_ip>>
stacklight_monitor_node02:
expression: <<node_hostname>>__equals__mon02
cluster_param:
- stacklight_monitor_node03_address:
+ stacklight_monitor_node02_address:
value_template: <<node_control_ip>>
stacklight_monitor_node03:
expression: <<node_hostname>>__equals__mon03
@@ -174,4 +174,4 @@
openstack_gateway_node01:
params:
tenant_address: 10.1.0.110
- external_address: 10.16.0.110
\ No newline at end of file
+ external_address: 10.16.0.110
diff --git a/classes/cluster/virtual-mcp05-ovs/infra/config.yml b/classes/cluster/virtual-mcp05-ovs/infra/config.yml
index 5e9068d..226b5e1 100644
--- a/classes/cluster/virtual-mcp05-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp05-ovs/infra/config.yml
@@ -117,12 +117,12 @@
stacklight_monitor_node01:
expression: <<node_hostname>>__equals__mon01
cluster_param:
- stacklight_monitor_node03_address:
+ stacklight_monitor_node01_address:
value_template: <<node_control_ip>>
stacklight_monitor_node02:
expression: <<node_hostname>>__equals__mon02
cluster_param:
- stacklight_monitor_node03_address:
+ stacklight_monitor_node02_address:
value_template: <<node_control_ip>>
stacklight_monitor_node03:
expression: <<node_hostname>>__equals__mon03
@@ -174,4 +174,4 @@
openstack_gateway_node01:
params:
tenant_address: 10.1.0.110
- external_address: 10.16.0.110
\ No newline at end of file
+ external_address: 10.16.0.110
diff --git a/classes/cluster/virtual-mcp10-contrail/infra/config.yml b/classes/cluster/virtual-mcp10-contrail/infra/config.yml
index c86ed5b..67f9f01 100755
--- a/classes/cluster/virtual-mcp10-contrail/infra/config.yml
+++ b/classes/cluster/virtual-mcp10-contrail/infra/config.yml
@@ -118,12 +118,12 @@
stacklight_monitor_node01:
expression: <<node_hostname>>__equals__mon01
cluster_param:
- stacklight_monitor_node03_address:
+ stacklight_monitor_node01_address:
value_template: <<node_control_ip>>
stacklight_monitor_node02:
expression: <<node_hostname>>__equals__mon02
cluster_param:
- stacklight_monitor_node03_address:
+ stacklight_monitor_node02_address:
value_template: <<node_control_ip>>
stacklight_monitor_node03:
expression: <<node_hostname>>__equals__mon03
diff --git a/classes/cluster/virtual-mcp10-dvr/infra/config.yml b/classes/cluster/virtual-mcp10-dvr/infra/config.yml
index d6bd4a2..fa7c6c4 100644
--- a/classes/cluster/virtual-mcp10-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp10-dvr/infra/config.yml
@@ -117,12 +117,12 @@
stacklight_monitor_node01:
expression: <<node_hostname>>__equals__mon01
cluster_param:
- stacklight_monitor_node03_address:
+ stacklight_monitor_node01_address:
value_template: <<node_control_ip>>
stacklight_monitor_node02:
expression: <<node_hostname>>__equals__mon02
cluster_param:
- stacklight_monitor_node03_address:
+ stacklight_monitor_node02_address:
value_template: <<node_control_ip>>
stacklight_monitor_node03:
expression: <<node_hostname>>__equals__mon03
@@ -174,4 +174,4 @@
openstack_gateway_node01:
params:
tenant_address: 10.1.0.110
- external_address: 10.16.0.110
\ No newline at end of file
+ external_address: 10.16.0.110
diff --git a/classes/cluster/virtual-mcp10-ovs/infra/config.yml b/classes/cluster/virtual-mcp10-ovs/infra/config.yml
index ab944e7..666de15 100644
--- a/classes/cluster/virtual-mcp10-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp10-ovs/infra/config.yml
@@ -117,12 +117,12 @@
stacklight_monitor_node01:
expression: <<node_hostname>>__equals__mon01
cluster_param:
- stacklight_monitor_node03_address:
+ stacklight_monitor_node01_address:
value_template: <<node_control_ip>>
stacklight_monitor_node02:
expression: <<node_hostname>>__equals__mon02
cluster_param:
- stacklight_monitor_node03_address:
+ stacklight_monitor_node02_address:
value_template: <<node_control_ip>>
stacklight_monitor_node03:
expression: <<node_hostname>>__equals__mon03
@@ -174,4 +174,4 @@
openstack_gateway_node01:
params:
tenant_address: 10.1.0.110
- external_address: 10.16.0.110
\ No newline at end of file
+ external_address: 10.16.0.110
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/infra/config.yml b/classes/cluster/virtual-mcp11-contrail-nfv/infra/config.yml
index a000956..fe44865 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/infra/config.yml
@@ -132,12 +132,12 @@
stacklight_monitor_node01:
expression: <<node_hostname>>__equals__mon01
cluster_param:
- stacklight_monitor_node03_address:
+ stacklight_monitor_node01_address:
value_template: <<node_control_ip>>
stacklight_monitor_node02:
expression: <<node_hostname>>__equals__mon02
cluster_param:
- stacklight_monitor_node03_address:
+ stacklight_monitor_node02_address:
value_template: <<node_control_ip>>
stacklight_monitor_node03:
expression: <<node_hostname>>__equals__mon03
@@ -188,4 +188,4 @@
classes:
- cluster.virtual-mcp11-contrail-nfv.openstack.proxy
params:
- linux_system_codename: xenial
\ No newline at end of file
+ linux_system_codename: xenial
diff --git a/classes/cluster/virtual-mcp11-contrail/infra/config.yml b/classes/cluster/virtual-mcp11-contrail/infra/config.yml
index 28cc045..af5abe0 100755
--- a/classes/cluster/virtual-mcp11-contrail/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-contrail/infra/config.yml
@@ -132,12 +132,12 @@
stacklight_monitor_node01:
expression: <<node_hostname>>__equals__mon01
cluster_param:
- stacklight_monitor_node03_address:
+ stacklight_monitor_node01_address:
value_template: <<node_control_ip>>
stacklight_monitor_node02:
expression: <<node_hostname>>__equals__mon02
cluster_param:
- stacklight_monitor_node03_address:
+ stacklight_monitor_node02_address:
value_template: <<node_control_ip>>
stacklight_monitor_node03:
expression: <<node_hostname>>__equals__mon03
@@ -180,4 +180,4 @@
classes:
- cluster.virtual-mcp11-contrail.openstack.proxy
params:
- linux_system_codename: xenial
\ No newline at end of file
+ linux_system_codename: xenial
diff --git a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
index be43047..693a7cb 100755
--- a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-contrail/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.prometheus
- 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-dvr/infra/config.yml b/classes/cluster/virtual-mcp11-dvr/infra/config.yml
index c1edf41..a6b94d7 100644
--- a/classes/cluster/virtual-mcp11-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-dvr/infra/config.yml
@@ -121,12 +121,12 @@
stacklight_monitor_node01:
expression: <<node_hostname>>__equals__mon01
cluster_param:
- stacklight_monitor_node03_address:
+ stacklight_monitor_node01_address:
value_template: <<node_control_ip>>
stacklight_monitor_node02:
expression: <<node_hostname>>__equals__mon02
cluster_param:
- stacklight_monitor_node03_address:
+ stacklight_monitor_node02_address:
value_template: <<node_control_ip>>
stacklight_monitor_node03:
expression: <<node_hostname>>__equals__mon03
@@ -183,4 +183,4 @@
classes:
- cluster.virtual-mcp11-dvr.openstack.proxy
params:
- linux_system_codename: xenial
\ No newline at end of file
+ linux_system_codename: xenial
diff --git a/classes/cluster/virtual-mcp11-dvr/infra/init.yml b/classes/cluster/virtual-mcp11-dvr/infra/init.yml
index 9140bd0..a698511 100644
--- a/classes/cluster/virtual-mcp11-dvr/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-dvr/infra/init.yml
@@ -1,4 +1,9 @@
parameters:
+parameters:
+ _param:
+ cluster_domain: virtual-mcp11-dvr.local
+ cluster_name: virtual-mcp11-dvr
+ infra_config_address: 172.16.10.100
linux:
network:
host:
diff --git a/classes/cluster/virtual-mcp11-dvr/init.yml b/classes/cluster/virtual-mcp11-dvr/init.yml
index 02f4581..80a2628 100644
--- a/classes/cluster/virtual-mcp11-dvr/init.yml
+++ b/classes/cluster/virtual-mcp11-dvr/init.yml
@@ -15,34 +15,3 @@
- cluster.virtual-mcp11-dvr.openstack
- cluster.virtual-mcp11-dvr.stacklight
- cluster.overrides
-parameters:
- _param:
- cluster_domain: virtual-mcp11-dvr.local
- cluster_name: virtual-mcp11-dvr
- # infra service addresses
- infra_config_address: 172.16.10.100
- # openstack service addresses
- openstack_database_address: 172.16.10.254
- openstack_proxy_address: 172.16.10.121
- openstack_proxy_node01_address: 172.16.10.121
- openstack_control_address: 172.16.10.254
- openstack_control_node01_address: 172.16.10.101
- openstack_control_node02_address: 172.16.10.102
- openstack_control_node03_address: 172.16.10.103
- openstack_database_address: ${_param:openstack_control_address}
- openstack_database_node01_address: ${_param:openstack_control_node01_address}
- openstack_database_node02_address: ${_param:openstack_control_node02_address}
- openstack_database_node03_address: ${_param:openstack_control_node03_address}
- openstack_message_queue_address: ${_param:openstack_control_address}
- openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
- openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
- openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
- openstack_gateway_address: 172.16.10.110
- # stacklight service addresses
- stacklight_monitor_address: 172.16.10.253
- stacklight_monitor_node01_address: 172.16.10.107
- stacklight_monitor_node02_address: 172.16.10.108
- stacklight_monitor_node03_address: 172.16.10.109
- stacklight_log_address: ${_param:stacklight_monitor_address}
- stacklight_telemetry_address: ${_param:stacklight_monitor_address}
- stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-dvr/openstack/init.yml b/classes/cluster/virtual-mcp11-dvr/openstack/init.yml
index 3a73066..c8b49ae 100644
--- a/classes/cluster/virtual-mcp11-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-dvr/openstack/init.yml
@@ -1,5 +1,21 @@
parameters:
_param:
+ openstack_database_address: 172.16.10.254
+ openstack_proxy_address: 172.16.10.121
+ openstack_proxy_node01_address: 172.16.10.121
+ openstack_control_address: 172.16.10.254
+ openstack_control_node01_address: 172.16.10.101
+ openstack_control_node02_address: 172.16.10.102
+ openstack_control_node03_address: 172.16.10.103
+ openstack_database_address: ${_param:openstack_control_address}
+ openstack_database_node01_address: ${_param:openstack_control_node01_address}
+ openstack_database_node02_address: ${_param:openstack_control_node02_address}
+ openstack_database_node03_address: ${_param:openstack_control_node03_address}
+ openstack_message_queue_address: ${_param:openstack_control_address}
+ openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
+ openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
+ openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
+ openstack_gateway_address: 172.16.10.110
openstack_version: newton
apt_mk_version: nightly
mcp_repo_version: 1.1
diff --git a/classes/cluster/virtual-mcp11-dvr/stacklight/init.yml b/classes/cluster/virtual-mcp11-dvr/stacklight/init.yml
index 0b10c03..f30d6e4 100644
--- a/classes/cluster/virtual-mcp11-dvr/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp11-dvr/stacklight/init.yml
@@ -1,5 +1,12 @@
parameters:
_param:
+ stacklight_monitor_address: 172.16.10.253
+ stacklight_monitor_node01_address: 172.16.10.107
+ stacklight_monitor_node02_address: 172.16.10.108
+ stacklight_monitor_node03_address: 172.16.10.109
+ stacklight_log_address: ${_param:stacklight_monitor_address}
+ stacklight_telemetry_address: ${_param:stacklight_monitor_address}
+ stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
prometheus_control_address: ${_param:stacklight_monitor_address}
heka_elasticsearch_host: ${_param:stacklight_monitor_address}
elasticsearch_port: 9200
diff --git a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
index 03bbc23..9e47cb3 100644
--- a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-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.prometheus
- 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-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
index 65ee4aa..d434b72 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
@@ -9,7 +9,7 @@
- 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.galera.server.cluster
- system.galera.server.database.grafana
@@ -17,6 +17,7 @@
- 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
- system.salt.minion.cert.prometheus_server
@@ -32,6 +33,7 @@
_param:
cluster_public_host: mon
cluster_vip_address: ${_param:stacklight_monitor_address}
+ 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
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml
index 7218523..ab3d282 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml
@@ -121,12 +121,12 @@
stacklight_monitor_node01:
expression: <<node_hostname>>__equals__mon01
cluster_param:
- stacklight_monitor_node03_address:
+ stacklight_monitor_node01_address:
value_template: <<node_control_ip>>
stacklight_monitor_node02:
expression: <<node_hostname>>__equals__mon02
cluster_param:
- stacklight_monitor_node03_address:
+ stacklight_monitor_node02_address:
value_template: <<node_control_ip>>
stacklight_monitor_node03:
expression: <<node_hostname>>__equals__mon03
@@ -187,4 +187,4 @@
classes:
- cluster.virtual-mcp11-ovs-dpdk.openstack.proxy
params:
- linux_system_codename: xenial
\ No newline at end of file
+ linux_system_codename: xenial
diff --git a/classes/cluster/virtual-mcp11-ovs/infra/config.yml b/classes/cluster/virtual-mcp11-ovs/infra/config.yml
index 37decff..9580db4 100644
--- a/classes/cluster/virtual-mcp11-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs/infra/config.yml
@@ -120,12 +120,12 @@
stacklight_monitor_node01:
expression: <<node_hostname>>__equals__mon01
cluster_param:
- stacklight_monitor_node03_address:
+ stacklight_monitor_node01_address:
value_template: <<node_control_ip>>
stacklight_monitor_node02:
expression: <<node_hostname>>__equals__mon02
cluster_param:
- stacklight_monitor_node03_address:
+ stacklight_monitor_node02_address:
value_template: <<node_control_ip>>
stacklight_monitor_node03:
expression: <<node_hostname>>__equals__mon03
@@ -182,4 +182,4 @@
classes:
- cluster.virtual-mcp11-ovs.openstack.proxy
params:
- linux_system_codename: xenial
\ No newline at end of file
+ linux_system_codename: xenial
diff --git a/classes/system b/classes/system
index bc49d34..0e05a52 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit bc49d346f1ac5df1bae934264aa95b1dc19e596b
+Subproject commit 0e05a52f3e35853ec8e2bd7ad8ea9bce297e218a