Update sl-os-contrail model to ocata
Change-Id: Iee4c367102ced269ef20752a6398494a35f03058
diff --git a/classes/cluster/sl-os-contrail/.env b/classes/cluster/sl-os-contrail/.env
new file mode 100644
index 0000000..49c1ca4
--- /dev/null
+++ b/classes/cluster/sl-os-contrail/.env
@@ -0,0 +1 @@
+EXTRA_FORMULAS="fluentd grafana heka nginx ntp prometheus rsyslog sphinx telegraf"
diff --git a/classes/cluster/sl-os-contrail/infra/config.yml b/classes/cluster/sl-os-contrail/infra/config.yml
index 79d69bf..6db02be 100755
--- a/classes/cluster/sl-os-contrail/infra/config.yml
+++ b/classes/cluster/sl-os-contrail/infra/config.yml
@@ -1,11 +1,8 @@
classes:
- service.git.client
-- system.docker.client
-- system.docker.host
- system.linux.system.single
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.docker
- system.openssh.client.lab
- system.salt.master.api
- system.salt.master.pkg
@@ -29,26 +26,22 @@
- system.keystone.client.service.nova-ec2
- system.keystone.client.service.nova21
- system.keystone.client.service.nova-placement
-- system.mysql.client
-- system.mysql.client.database.cinder
-- system.mysql.client.database.glance
-- system.mysql.client.database.heat
-- system.mysql.client.database.keystone
-- system.mysql.client.database.nova
-- system.mysql.client.database.nova_api
-- system.mysql.client.database.neutron
+- system.mysql.client.single
- system.reclass.storage.system.openstack_control_cluster
- system.reclass.storage.system.opencontrail_control_cluster
+- system.reclass.storage.system.stacklightv2_server_cluster
+- system.reclass.storage.system.openstack_compute_multi
+- system.reclass.storage.system.openstack_dashboard_single
+- system.reclass.storage.system.openstack_proxy_single
- cluster.sl-os-contrail.openstack.proxy
- cluster.sl-os-contrail.stacklight.proxy
-- cluster.sl-os-contrail.openstack.dashboard
- cluster.sl-os-contrail
parameters:
_param:
reclass_data_repository: "https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab"
reclass_data_revision: master
- reclass_config_master: ${_param:infra_config_deploy_address}
- single_address: ${_param:infra_config_address}
+ reclass_config_master: 192.168.10.90
+ single_address: 172.16.10.90
salt_master_host: 127.0.0.1
salt_master_base_environment: prd
salt_minion_ca_host: ${linux:network:fqdn}
@@ -67,7 +60,7 @@
site:
nginx_proxy_openstack_web:
proxy:
- host: cfg
+ host: prx
nginx_proxy_openstack_api_heat_cfn:
enabled: false
salt:
@@ -125,7 +118,7 @@
expression: <<node_hostname>>__equals__ntw03
cluster_param:
opencontrail_control_node03_address:
- value_template: <<node_control_ip>>
+ value_template: <<node_control_ip>>
openstack_compute:
expression: <<node_hostname>>__startswith__cmp
node_class:
@@ -136,89 +129,55 @@
value_template: <<node_tenant_ip>>
external_address:
value_template: <<node_external_ip>>
- stacklight_monitor01:
+ stacklight_monitor_node01:
expression: <<node_hostname>>__equals__mon01
cluster_param:
stacklight_monitor_node01_address:
value_template: <<node_control_ip>>
- stacklight_monitor02:
+ stacklight_monitor_node02:
expression: <<node_hostname>>__equals__mon02
cluster_param:
stacklight_monitor_node02_address:
value_template: <<node_control_ip>>
- stacklight_monitor03:
+ stacklight_monitor_node03:
expression: <<node_hostname>>__equals__mon03
cluster_param:
stacklight_monitor_node03_address:
value_template: <<node_control_ip>>
+ openstack_dashboard:
+ expression: <<node_hostname>>__startswith__prx
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.openstack.dashboard
+ - cluster.<<node_cluster>>.openstack.proxy
+ cluster_param:
+ openstack_proxy_node01_address:
+ value_template: <<node_control_ip>>
node:
- prx_node:
- name: ${_param:openstack_proxy_node01_hostname}
- domain: ${_param:cluster_domain}
- classes:
- - cluster.${_param:cluster_name}.stacklight.proxy
- params:
- salt_master_host: ${_param:infra_config_deploy_address}
- linux_system_codename: xenial
- single_address: ${_param:openstack_proxy_node01_address}
- stacklight_server_node01:
- name: ${_param:stacklight_monitor_node01_hostname}
- domain: ${_param:cluster_domain}
- classes:
- - system.docker.swarm.master
- - cluster.${_param:cluster_name}.stacklight.client
- - cluster.${_param:cluster_name}.stacklight.server
- params:
- salt_master_host: ${_param:infra_config_deploy_address}
- linux_system_codename: xenial
- single_address: ${_param:stacklight_monitor_node01_address}
- keepalived_vip_priority: 100
- stacklight_server_node02:
- name: ${_param:stacklight_monitor_node02_hostname}
- domain: ${_param:cluster_domain}
- classes:
- - system.docker.swarm.manager
- - cluster.${_param:cluster_name}.stacklight.server
- params:
- salt_master_host: ${_param:infra_config_deploy_address}
- linux_system_codename: xenial
- single_address: ${_param:stacklight_monitor_node02_address}
- keepalived_vip_priority: 101
- stacklight_server_node03:
- name: ${_param:stacklight_monitor_node03_hostname}
- domain: ${_param:cluster_domain}
- classes:
- - system.docker.swarm.manager
- - cluster.${_param:cluster_name}.stacklight.server
- params:
- salt_master_host: ${_param:infra_config_deploy_address}
- linux_system_codename: xenial
- single_address: ${_param:stacklight_monitor_node03_address}
- keepalived_vip_priority: 102
- opencontrail_control_node01:
- params:
- rabbitmq_cluster_role: master
- opencontrail_control_node02:
- params:
- rabbitmq_cluster_role: slave
- opencontrail_control_node03:
- params:
- rabbitmq_cluster_role: slave
openstack_control_node01:
classes:
- service.galera.master.cluster
params:
- linux_system_codename: xenial
mysql_cluster_role: master
+ linux_system_codename: xenial
openstack_control_node02:
classes:
- service.galera.slave.cluster
params:
- linux_system_codename: xenial
mysql_cluster_role: slave
+ linux_system_codename: xenial
openstack_control_node03:
classes:
- service.galera.slave.cluster
params:
- linux_system_codename: xenial
mysql_cluster_role: slave
+ linux_system_codename: xenial
+ stacklight_server_node01:
+ classes:
+ - system.influxdb.server.single
+ - system.influxdb.database.stacklight
+ openstack_proxy_node01:
+ classes:
+ - cluster.sl-os-contrail.openstack.proxy
+ params:
+ linux_system_codename: xenial
diff --git a/classes/cluster/sl-os-contrail/infra/init.yml b/classes/cluster/sl-os-contrail/infra/init.yml
index 5c878d4..6c44489 100755
--- a/classes/cluster/sl-os-contrail/infra/init.yml
+++ b/classes/cluster/sl-os-contrail/infra/init.yml
@@ -1,13 +1,9 @@
parameters:
- _jenkins:
- tests_enabled: false
_param:
cluster_domain: sl-os-contrail.local
cluster_name: sl-os-contrail
- infra_config_deploy_address: 192.168.10.90
- infra_config_address: 172.16.10.100
infra_config_hostname: cfg01
- linux_system_repo_mcp_salt_version: nightly
+ infra_config_address: 172.16.10.90
linux:
network:
host:
diff --git a/classes/cluster/sl-os-contrail/init.yml b/classes/cluster/sl-os-contrail/init.yml
index e410120..dc46bda 100755
--- a/classes/cluster/sl-os-contrail/init.yml
+++ b/classes/cluster/sl-os-contrail/init.yml
@@ -1,12 +1,22 @@
classes:
- system.linux.network.dynamic_hosts
+- service.grafana.collector
+- system.fluentd
+- system.fluentd.label.default_metric
+- system.fluentd.label.default_metric.prometheus
+- system.fluentd.label.default_output.elasticsearch
+- system.fluentd.label.default_output.drop_event
- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.fluentd
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.linux.system.single
- system.rsyslog.client.single
- system.openssh.server.team.lab
- system.openssh.server.team.tcpcloud
- system.openssh.server.team.stacklight
- system.openssh.server.team.mcp_qa
+- system.prometheus.collector
+- system.telegraf.agent
- cluster.sl-os-contrail.infra
- cluster.sl-os-contrail.opencontrail
- cluster.sl-os-contrail.openstack
diff --git a/classes/cluster/sl-os-contrail/opencontrail/control.yml b/classes/cluster/sl-os-contrail/opencontrail/control.yml
index 314d968..7c5e60b 100644
--- a/classes/cluster/sl-os-contrail/opencontrail/control.yml
+++ b/classes/cluster/sl-os-contrail/opencontrail/control.yml
@@ -4,7 +4,7 @@
- system.linux.system.repo.mcp.contrail
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.saltstack.trusty
- system.opencontrail.client.resource.edge_router
- system.opencontrail.control.cluster
- system.opencontrail.client.cluster
@@ -13,6 +13,7 @@
- system.opencontrail.client.resource.database_node
- system.opencontrail.client.resource.analytics_node
- system.haproxy.proxy.listen.opencontrail.analytics
+- system.prometheus.exporters.jmx
- cluster.sl-os-contrail
parameters:
_param:
diff --git a/classes/cluster/sl-os-contrail/opencontrail/init.yml b/classes/cluster/sl-os-contrail/opencontrail/init.yml
index cee0b50..7e1e78c 100644
--- a/classes/cluster/sl-os-contrail/opencontrail/init.yml
+++ b/classes/cluster/sl-os-contrail/opencontrail/init.yml
@@ -34,4 +34,4 @@
address: ${_param:opencontrail_control_node03_address}
names:
- ${_param:opencontrail_control_node03_hostname}
- - ${_param:opencontrail_control_node03_hostname}.${_param:cluster_domain}
\ No newline at end of file
+ - ${_param:opencontrail_control_node03_hostname}.${_param:cluster_domain}
diff --git a/classes/cluster/sl-os-contrail/openstack/compute.yml b/classes/cluster/sl-os-contrail/openstack/compute.yml
index 3876f10..e010b73 100755
--- a/classes/cluster/sl-os-contrail/openstack/compute.yml
+++ b/classes/cluster/sl-os-contrail/openstack/compute.yml
@@ -5,11 +5,12 @@
- system.linux.system.repo.saltstack.xenial
- system.linux.network.hosts
- system.nova.compute.cluster
+- system.ceilometer.agent.cluster
- system.opencontrail.compute.cluster
- system.opencontrail.client.cluster
- system.opencontrail.client.resource.virtual_router
-- service.opencontrail.compute.cluster
- system.prometheus.exporters.libvirt
+- service.opencontrail.compute.cluster
- cluster.sl-os-contrail
parameters:
_param:
@@ -58,6 +59,13 @@
topics: "notifications,${_param:stacklight_notification_topic}"
notify_on:
state_change: vm_and_task_state
+ ceilometer:
+ agent:
+ message_queue:
+ members:
+ - host: ${_param:openstack_control_node01_address}
+ - host: ${_param:openstack_control_node02_address}
+ - host: ${_param:openstack_control_node03_address}
opencontrail:
common:
network:
diff --git a/classes/cluster/sl-os-contrail/openstack/control.yml b/classes/cluster/sl-os-contrail/openstack/control.yml
index c934ea0..dee70ed 100755
--- a/classes/cluster/sl-os-contrail/openstack/control.yml
+++ b/classes/cluster/sl-os-contrail/openstack/control.yml
@@ -18,12 +18,21 @@
- system.glusterfs.client.volume.keystone
- system.glance.control.cluster
- system.nova.control.cluster
+- system.haproxy.proxy.listen.openstack.nova-placement
- system.neutron.control.opencontrail.cluster
- system.cinder.control.cluster
- system.heat.server.cluster
+- system.opencontrail.client.cluster
+- system.heat.server.resource.contrail
- system.designate.server.cluster
- system.designate.server.backend.bind
+- system.ceilometer.server.cluster
+- system.ceilometer.server.backend.influxdb
+- system.aodh.server.cluster
+- system.heka.ceilometer_collector.single
- system.galera.server.cluster
+- system.galera.server.database.aodh
+- system.galera.server.database.ceilometer
- system.galera.server.database.cinder
- system.galera.server.database.glance
- system.galera.server.database.grafana
@@ -31,8 +40,6 @@
- system.galera.server.database.keystone
- system.galera.server.database.nova
- system.galera.server.database.designate
-- system.haproxy.proxy.listen.openstack.nova-placement
-- system.prometheus.exporters.jmx
- cluster.sl-os-contrail
parameters:
_param:
@@ -165,4 +172,3 @@
notification:
driver: messagingv2
topics: "notifications,${_param:stacklight_notification_topic}"
-
diff --git a/classes/cluster/sl-os-contrail/openstack/dashboard.yml b/classes/cluster/sl-os-contrail/openstack/dashboard.yml
index 0068d41..4b8ad35 100755
--- a/classes/cluster/sl-os-contrail/openstack/dashboard.yml
+++ b/classes/cluster/sl-os-contrail/openstack/dashboard.yml
@@ -6,6 +6,7 @@
- system.horizon.server.single
- system.horizon.server.plugin.contrail
- system.horizon.server.plugin.overrides
+- system.horizon.server.plugin.theme
- cluster.sl-os-contrail
parameters:
_param:
@@ -19,7 +20,3 @@
proto: static
address: ${_param:single_address}
netmask: 255.255.255.0
- horizon:
- server:
- identity:
- host: ctl
\ No newline at end of file
diff --git a/classes/cluster/sl-os-contrail/openstack/init.yml b/classes/cluster/sl-os-contrail/openstack/init.yml
index ebaf4ae..c600e35 100755
--- a/classes/cluster/sl-os-contrail/openstack/init.yml
+++ b/classes/cluster/sl-os-contrail/openstack/init.yml
@@ -1,43 +1,26 @@
parameters:
_param:
openstack_proxy_address: 172.16.10.121
- openstack_proxy_node01_hostname: prx01
openstack_proxy_node01_address: 172.16.10.121
-
openstack_control_address: 172.16.10.254
- openstack_control_node01_hostname: ctl01
- openstack_control_node02_hostname: ctl02
- openstack_control_node03_hostname: ctl03
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_hostname: dbs01
- openstack_database_node02_hostname: dbs02
- openstack_database_node03_hostname: dbs03
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_node02_address}
-
openstack_message_queue_address: ${_param:openstack_control_address}
- openstack_message_queue_node01_hostname: msg01
- openstack_message_queue_node02_hostname: msg02
- openstack_message_queue_node03_hostname: msg03
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_compute_node01_hostname: cmp01
- openstack_compute_node02_hostname: cmp02
- openstack_compute_node01_address: 172.16.10.105
- openstack_compute_node02_address: 172.16.10.106
-
openstack_version: ocata
apt_mk_version: nightly
openstack_region: RegionOne
admin_email: root@localhost
- cluster_public_host: ${_param:openstack_control_address}
+ cluster_public_host: 172.16.10.254
+ neutron_public_protocol: http
+ cluster_public_protocol: http
opencontrail_version: 3.0
opencontrail_compute_dns: 8.8.8.8
opencontrail_stats_password: contrail123
@@ -48,7 +31,6 @@
rabbitmq_admin_password: workshop
rabbitmq_openstack_password: workshop
rabbitmq_cold_password: workshop
- designate_admin_api_enabled: true
designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8
designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
designate_pool_ns_records:
@@ -85,20 +67,27 @@
heat_version: ${_param:openstack_version}
heat_service_host: ${_param:openstack_control_address}
heat_domain_admin_password: workshop
+ ceilometer_version: ${_param:openstack_version}
+ ceilometer_service_host: ${_param:openstack_control_address}
+ aodh_version: ${_param:openstack_version}
+ aodh_service_host: ${_param:openstack_control_address}
cinder_version: ${_param:openstack_version}
cinder_service_host: ${_param:openstack_control_address}
+ ceilometer_graphite_publisher_host: 172.16.10.107
+ ceilometer_graphite_publisher_port: 2013
nova_version: ${_param:openstack_version}
nova_service_host: ${_param:openstack_control_address}
nova_vncproxy_url: http://${_param:openstack_control_address}:8060
neutron_version: ${_param:openstack_version}
neutron_service_host: ${_param:openstack_control_address}
glusterfs_service_host: ${_param:openstack_control_address}
- designate_version: ${_param:openstack_version}
designate_service_host: ${_param:openstack_control_address}
mysql_admin_user: root
mysql_admin_password: workshop
+ mysql_aodh_password: workshop
mysql_designate_password: workshop
mysql_cinder_password: workshop
+ mysql_ceilometer_password: workshop
mysql_glance_password: workshop
mysql_grafana_password: workshop
mysql_heat_password: workshop
@@ -107,6 +96,8 @@
mysql_nova_password: workshop
keystone_service_token: workshop
keystone_admin_password: workshop
+ keystone_aodh_password: workshop
+ keystone_ceilometer_password: workshop
keystone_cinder_password: workshop
keystone_glance_password: workshop
keystone_heat_password: workshop
@@ -114,20 +105,23 @@
keystone_neutron_password: workshop
keystone_nova_password: workshop
keystone_designate_password: workshop
- keystone_aodh_password: workshop
- keystone_ceilometer_password: workshop
+ ceilometer_secret_key: workshop
metadata_password: workshop
horizon_version: ${_param:openstack_version}
horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
horizon_identity_host: ${_param:openstack_control_address}
horizon_identity_encryption: none
horizon_identity_version: 2
- aodh_version: ${_param:openstack_version}
- aodh_service_host: ${_param:cluster_vip_address}
- ceilometer_version: ${_param:openstack_version}
- ceilometer_service_host: ${_param:cluster_vip_address}
+ mongodb_server_replica_set: ceilometer
+ mongodb_ceilometer_password: cloudlab
+ mongodb_admin_password: cloudlab
+ mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
+ ceilometer_influxdb_password: lmapass
+ openstack_log_appender: true
+ openstack_fluentd_handler_enabled: true
linux:
network:
+ purge_hosts: true
host:
prx:
address: ${_param:openstack_proxy_address}
@@ -137,7 +131,7 @@
prx01:
address: ${_param:openstack_proxy_node01_address}
names:
- - ${_param:openstack_proxy_node01_hostname}
+ - prx01
- prx01.${_param:cluster_domain}
ctl:
address: ${_param:openstack_control_address}
@@ -147,65 +141,30 @@
ctl01:
address: ${_param:openstack_control_node01_address}
names:
- - ${_param:openstack_control_node01_hostname}
- - ${_param:openstack_control_node01_hostname}.${_param:cluster_domain}
+ - ctl01
+ - ctl01.${_param:cluster_domain}
ctl02:
address: ${_param:openstack_control_node02_address}
names:
- - ${_param:openstack_control_node02_hostname}
- - ${_param:openstack_control_node02_hostname}.${_param:cluster_domain}
+ - ctl02
+ - ctl02.${_param:cluster_domain}
ctl03:
address: ${_param:openstack_control_node03_address}
names:
- - ${_param:openstack_control_node03_hostname}
- - ${_param:openstack_control_node03_hostname}.${_param:cluster_domain}
- msg:
- address: ${_param:openstack_message_queue_address}
- names:
- - msg
- - msg.${_param:cluster_domain}
- msg01:
- address: ${_param:openstack_message_queue_node01_address}
- names:
- - ${_param:openstack_message_queue_node01_hostname}
- - ${_param:openstack_message_queue_node01_hostname}.${_param:cluster_domain}
- msg02:
- address: ${_param:openstack_message_queue_node02_address}
- names:
- - ${_param:openstack_message_queue_node02_hostname}
- - ${_param:openstack_message_queue_node02_hostname}.${_param:cluster_domain}
- msg03:
- address: ${_param:openstack_message_queue_node03_address}
- names:
- - ${_param:openstack_message_queue_node03_hostname}
- - ${_param:openstack_message_queue_node03_hostname}.${_param:cluster_domain}
- dbs:
- address: ${_param:openstack_database_address}
- names:
- - dbs
- - dbs.${_param:cluster_domain}
- dbs01:
- address: ${_param:openstack_database_node01_address}
- names:
- - ${_param:openstack_database_node01_hostname}
- - ${_param:openstack_database_node01_hostname}.${_param:cluster_domain}
- dbs02:
- address: ${_param:openstack_database_node02_address}
- names:
- - ${_param:openstack_database_node02_hostname}
- - ${_param:openstack_database_node02_hostname}.${_param:cluster_domain}
- dbs03:
- address: ${_param:openstack_database_node03_address}
- names:
- - ${_param:openstack_database_node03_hostname}
- - ${_param:openstack_database_node03_hostname}.${_param:cluster_domain}
+ - ctl03
+ - ctl03.${_param:cluster_domain}
cmp01:
- address: ${_param:openstack_compute_node01_address}
+ address: 172.16.10.105
names:
- - ${_param:openstack_compute_node01_hostname}
- - ${_param:openstack_compute_node01_hostname}.${_param:cluster_domain}
+ - cmp01
+ - cmp01.${_param:cluster_domain}
cmp02:
- address: ${_param:openstack_compute_node02_address}
+ address: 172.16.10.106
names:
- - ${_param:openstack_compute_node02_hostname}
- - ${_param:openstack_compute_node02_hostname}.${_param:cluster_domain}
+ - cmp02
+ - cmp02.${_param:cluster_domain}
+ system:
+ user:
+ root:
+ name: root
+ password: false
diff --git a/classes/cluster/sl-os-contrail/stacklight/client.yml b/classes/cluster/sl-os-contrail/stacklight/client.yml
index 7373bd3..4988908 100755
--- a/classes/cluster/sl-os-contrail/stacklight/client.yml
+++ b/classes/cluster/sl-os-contrail/stacklight/client.yml
@@ -1,11 +1,9 @@
classes:
+- system.docker.client
- system.elasticsearch.client.single
- system.grafana.client
- system.grafana.client.datasource.prometheus
- system.kibana.client.single
-- system.heka.log_collector.single
-- system.heka.log_collector.output.telegraf
-- cluster.sl-os-contrail
parameters:
_param:
# Elasticsearch/Kibana client parameters
@@ -17,4 +15,7 @@
grafana_password: ${_param:grafana_admin_password}
grafana_prometheus_address: ${_param:stacklight_monitor_address}
grafana_prometheus_port: 15016
- stacklight_prometheus_port: 15010
+
+ cluster_node01_address: ${_param:stacklight_monitor_node01_address}
+ cluster_node02_address: ${_param:stacklight_monitor_node02_address}
+ cluster_node03_address: ${_param:stacklight_monitor_node03_address}
diff --git a/classes/cluster/sl-os-contrail/stacklight/init.yml b/classes/cluster/sl-os-contrail/stacklight/init.yml
index 8c63110..18c364e 100755
--- a/classes/cluster/sl-os-contrail/stacklight/init.yml
+++ b/classes/cluster/sl-os-contrail/stacklight/init.yml
@@ -1,21 +1,12 @@
-classes:
-- service.grafana.collector
-- system.linux.system.repo.mcp.extra
-- system.heka.log_collector.single
-- system.heka.log_collector.output.telegraf
-- system.prometheus.collector
-- system.telegraf.agent
parameters:
_param:
stacklight_monitor_address: 172.16.10.253
- stacklight_monitor_node01_hostname: mon01
- stacklight_monitor_node02_hostname: mon02
- stacklight_monitor_node03_hostname: mon03
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
@@ -25,6 +16,7 @@
grafana_database_type: mysql
grafana_database_host: ${_param:openstack_database_address}
grafana_database_password: ${_param:mysql_grafana_password}
+ fluentd_elasticsearch_host: ${_param:stacklight_log_address}
linux:
network:
host:
@@ -36,15 +28,15 @@
mon01:
address: ${_param:stacklight_monitor_node01_address}
names:
- - ${_param:stacklight_monitor_node01_hostname}
- - ${_param:stacklight_monitor_node01_hostname}.${_param:cluster_domain}
+ - mon01
+ - mon01.${_param:cluster_domain}
mon02:
address: ${_param:stacklight_monitor_node02_address}
names:
- - ${_param:stacklight_monitor_node02_hostname}
- - ${_param:stacklight_monitor_node02_hostname}.${_param:cluster_domain}
+ - mon02
+ - mon02.${_param:cluster_domain}
mon03:
address: ${_param:stacklight_monitor_node03_address}
names:
- - ${_param:stacklight_monitor_node03_hostname}
- - ${_param:stacklight_monitor_node03_hostname}.${_param:cluster_domain}
+ - mon03
+ - mon03.${_param:cluster_domain}
diff --git a/classes/cluster/sl-os-contrail/stacklight/proxy.yml b/classes/cluster/sl-os-contrail/stacklight/proxy.yml
index 5dd1640..9410ad0 100755
--- a/classes/cluster/sl-os-contrail/stacklight/proxy.yml
+++ b/classes/cluster/sl-os-contrail/stacklight/proxy.yml
@@ -9,7 +9,6 @@
parameters:
_param:
nginx_proxy_grafana_port: 15013
- cluster_public_host: ${_param:prometheus_control_address}
nginx_proxy_ssl:
enabled: true
authority: ${_param:salt_minion_ca_authority}
diff --git a/classes/cluster/sl-os-contrail/stacklight/server.yml b/classes/cluster/sl-os-contrail/stacklight/server.yml
index f67f8dd..8eaf978 100755
--- a/classes/cluster/sl-os-contrail/stacklight/server.yml
+++ b/classes/cluster/sl-os-contrail/stacklight/server.yml
@@ -2,9 +2,13 @@
- system.docker.host
- system.linux.system.repo.influxdb
- system.linux.system.repo.mcp.salt
-- system.linux.system.repo.elasticsearch.5
-- system.linux.system.repo.kibana.5
+- system.linux.system.repo.mcp.apt_mirantis.elastic
+- system.linux.system.repo.mcp.apt_mirantis.kibana
- system.linux.system.repo.docker
+- system.heka.remote_collector.container
+- system.heka.remote_collector.input.amqp
+- system.heka.remote_collector.output.elasticsearch
+- system.heka.remote_collector.output.telegraf
- system.elasticsearch.server.cluster
- system.elasticsearch.server.curator
- system.kibana.server.single
@@ -15,17 +19,19 @@
- system.influxdb.relay.cluster
- system.influxdb.server.single
- system.influxdb.database.prometheus
+- system.influxdb.database.ceilometer
- 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.monitoring.prometheus_global
-- system.docker.swarm.stack.dashboard
- system.docker.swarm.stack.monitoring.remote_collector
+- system.docker.swarm.stack.dashboard
- cluster.sl-os-contrail
parameters:
_param:
+ heka_amqp_host: ${_param:openstack_control_address}
kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
keepalived_prometheus_vip_password: 'password'
@@ -34,38 +40,28 @@
cluster_local_address: ${_param:single_address}
cluster_elasticsearch_port: 9200
cluster_kibana_port: 5601
- cluster_node01_hostname: ${_param:stacklight_monitor_node01_hostname}
+ cluster_node01_hostname: mon01
cluster_node01_address: ${_param:stacklight_monitor_node01_address}
- cluster_node02_hostname: ${_param:stacklight_monitor_node02_hostname}
+ cluster_node02_hostname: mon02
cluster_node02_address: ${_param:stacklight_monitor_node02_address}
- cluster_node03_hostname: ${_param:stacklight_monitor_node03_hostname}
+ cluster_node03_hostname: mon03
cluster_node03_address: ${_param:stacklight_monitor_node03_address}
- grafana_admin_password: admin
- grafana_database_type: mysql
- grafana_database_host: ${_param:openstack_database_address}
- grafana_database_password: ${_param:mysql_grafana_password}
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
docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
- 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_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:latest
docker_image_grafana: grafana/grafana:4.5.2
- grafana_admin_password: admin
- grafana_database_type: mysql
- grafana_database_host: ${_param:cluster_vip_address}
- grafana_database_password: ${_param:mysql_grafana_password}
+ influxdb_port: 8086
+ influxdb_admin_password: password
+ influxdb_stacklight_password: lmapass
prometheus_influxdb_url: "http://${_param:stacklight_monitor_address}:${_param:influxdb_port}/"
prometheus_influxdb_db: prometheus
prometheus_influxdb_username: lma
prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
- influxdb_port: 8086
- influxdb_admin_password: password
- influxdb_stacklight_password: lmapass
- openstack_version: newton
remote_collector_telegraf_host: monitoring_remote_agent
- heka_amqp_host: ${_param:openstack_control_address}
linux:
network:
interface:
@@ -75,7 +71,3 @@
proto: static
address: ${_param:single_address}
netmask: 255.255.255.0
- elasticsearch:
- server:
- heap:
- size: 1