Update Stacklight OS models
Change-Id: If974ac4205f2ba916c400239bd500d0df759b427
diff --git a/classes/cluster/sl_os_contrail/stacklight/server.yml b/classes/cluster/sl_os_contrail/stacklight/server.yml
index d702151..ac37c38 100755
--- a/classes/cluster/sl_os_contrail/stacklight/server.yml
+++ b/classes/cluster/sl_os_contrail/stacklight/server.yml
@@ -36,11 +36,11 @@
cluster_vip_address: ${_param:stacklight_monitor_address}
cluster_elasticsearch_port: 9200
cluster_kibana_port: 5601
- cluster_node01_hostname: mon01
+ cluster_node01_hostname: ${_param:stacklight_monitor_node01_hostname}
cluster_node01_address: ${_param:stacklight_monitor_node01_address}
- cluster_node02_hostname: mon02
+ cluster_node02_hostname: ${_param:stacklight_monitor_node02_hostname}
cluster_node02_address: ${_param:stacklight_monitor_node02_address}
- cluster_node03_hostname: mon03
+ cluster_node03_hostname: ${_param:stacklight_monitor_node03_hostname}
cluster_node03_address: ${_param:stacklight_monitor_node03_address}
grafana_admin_password: admin
grafana_database_type: mysql
@@ -56,13 +56,18 @@
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
+ grafana_admin_password: admin
+ grafana_database_type: mysql
+ grafana_database_host: ${_param:cluster_vip_address}
+ grafana_database_password: ${_param:mysql_grafana_password}
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
linux:
network:
interface:
@@ -72,3 +77,12 @@
proto: static
address: ${_param:single_address}
netmask: 255.255.255.0
+ elasticsearch:
+ server:
+ heap:
+ size: 1
+ keepalived:
+ cluster:
+ instance:
+ VIP:
+ enabled: false
\ No newline at end of file
diff --git a/classes/cluster/sl_os_ovs/stacklight/server.yml b/classes/cluster/sl_os_ovs/stacklight/server.yml
index 351337d..7f4d0e1 100644
--- a/classes/cluster/sl_os_ovs/stacklight/server.yml
+++ b/classes/cluster/sl_os_ovs/stacklight/server.yml
@@ -30,10 +30,11 @@
cluster_kibana_port: 5601
cluster_grafana_port: 3000
cluster_node01_name: mon01
+ cluster_node01_hostname: ${_param:stacklight_monitor_node01_hostname}
cluster_node01_address: ${_param:stacklight_monitor_node01_address}
- cluster_node02_name: mon02
+ cluster_node02_hostname: ${_param:stacklight_monitor_node02_hostname}
cluster_node02_address: ${_param:stacklight_monitor_node02_address}
- cluster_node03_name: mon03
+ cluster_node03_hostname: ${_param:stacklight_monitor_node03_hostname}
cluster_node03_address: ${_param:stacklight_monitor_node03_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
@@ -41,7 +42,37 @@
docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf: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
+ grafana_admin_password: admin
+ grafana_database_type: mysql
+ grafana_database_host: ${_param:cluster_vip_address}
+ grafana_database_password: ${_param:mysql_grafana_password}
+ 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
+ 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}
+ linux:
+ network:
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
elasticsearch:
server:
heap:
size: 1
+ keepalived:
+ cluster:
+ instance:
+ VIP:
+ enabled: false
\ No newline at end of file