Remove nodes spec., deprecated in new way
Change-Id: I2677b0a5c5b564648ec3a1e8a0cd9bb9ad289080
diff --git a/classes/cluster/sl-k8s-contrail/infra/config.yml b/classes/cluster/sl-k8s-contrail/infra/config.yml
index c287f17..2a83d69 100644
--- a/classes/cluster/sl-k8s-contrail/infra/config.yml
+++ b/classes/cluster/sl-k8s-contrail/infra/config.yml
@@ -9,7 +9,7 @@
- system.reclass.storage.salt
- system.salt.minion.cert.k8s_server
- system.reclass.storage.system.kubernetes_control_cluster
-- system.reclass.storage.system.opencontrail_control_cluster
+#- system.reclass.storage.system.opencontrail_control_cluster
- cluster.sl-k8s-contrail
parameters:
_param:
@@ -19,6 +19,7 @@
reclass_config_master: ${_param:infra_config_deploy_address}
single_address: ${_param:infra_config_address}
linux_system_codename: xenial
+ opencontrail_control_system_codename: trusty
salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
salt_master_host: ${_param:infra_config_deploy_address}
salt:
@@ -152,11 +153,38 @@
keepalived_vip_priority: 102
mysql_cluster_role: slave
opencontrail_control_node01:
+ name: ${_param:opencontrail_control_node01_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.opencontrail.control
params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: ${_param:opencontrail_control_system_codename}
+ single_address: ${_param:opencontrail_control_node01_address}
+ keepalived_vip_priority: 103
+ opencontrail_database_id: 1
rabbitmq_cluster_role: master
opencontrail_control_node02:
+ name: ${_param:opencontrail_control_node02_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.opencontrail.control
params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: ${_param:opencontrail_control_system_codename}
+ single_address: ${_param:opencontrail_control_node02_address}
+ keepalived_vip_priority: 102
+ opencontrail_database_id: 2
rabbitmq_cluster_role: slave
opencontrail_control_node03:
+ name: ${_param:opencontrail_control_node03_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.opencontrail.control
params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: ${_param:opencontrail_control_system_codename}
+ single_address: ${_param:opencontrail_control_node03_address}
+ keepalived_vip_priority: 101
+ opencontrail_database_id: 3
rabbitmq_cluster_role: slave
diff --git a/classes/cluster/sl-k8s-contrail/infra/init.yml b/classes/cluster/sl-k8s-contrail/infra/init.yml
index 0b58654..6a22605 100644
--- a/classes/cluster/sl-k8s-contrail/infra/init.yml
+++ b/classes/cluster/sl-k8s-contrail/infra/init.yml
@@ -12,6 +12,7 @@
cluster_domain: sl-k8s-contrail.local
cluster_name: sl-k8s-contrail
+ cluster_public_host: 172.16.10.254
apt_mk_version: nightly
linux:
network:
diff --git a/classes/cluster/sl-k8s-contrail/stacklight/init.yml b/classes/cluster/sl-k8s-contrail/stacklight/init.yml
index 12a5c01..c8ed2df 100644
--- a/classes/cluster/sl-k8s-contrail/stacklight/init.yml
+++ b/classes/cluster/sl-k8s-contrail/stacklight/init.yml
@@ -8,12 +8,13 @@
parameters:
_param:
stacklight_monitor_address: 172.16.10.251
- stacklight_node01_hostname: mon01
- stacklight_node02_hostname: mon02
- stacklight_node03_hostname: mon03
- stacklight_node01_address: 172.16.10.107
- stacklight_node02_address: 172.16.10.108
- stacklight_node03_address: 172.16.10.109
+ 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
+
# Prometheus
prometheus_control_address: ${_param:stacklight_monitor_address}
@@ -38,20 +39,20 @@
- mon
- mon.${_param:cluster_domain}
mon01:
- address: ${_param:stacklight_node01_address}
+ address: ${_param:stacklight_monitor_node01_address}
names:
- - ${_param:stacklight_node01_hostname}
- - ${_param:stacklight_node01_hostname}.${_param:cluster_domain}
+ - ${_param:stacklight_monitor_node01_hostname}
+ - ${_param:stacklight_monitor_node01_hostname}.${_param:cluster_domain}
mon02:
- address: ${_param:stacklight_node02_address}
+ address: ${_param:stacklight_monitor_node02_address}
names:
- - ${_param:stacklight_node02_hostname}
- - ${_param:stacklight_node02_hostname}.${_param:cluster_domain}
+ - ${_param:stacklight_monitor_node02_hostname}
+ - ${_param:stacklight_monitor_node02_hostname}.${_param:cluster_domain}
mon03:
- address: ${_param:stacklight_node03_address}
+ address: ${_param:stacklight_monitor_node03_address}
names:
- - ${_param:stacklight_node03_hostname}
- - ${_param:stacklight_node03_hostname}.${_param:cluster_domain}
+ - ${_param:stacklight_monitor_node03_hostname}
+ - ${_param:stacklight_monitor_node03_hostname}.${_param:cluster_domain}
system:
name: ${_param:infra_config_hostname}
domain: ${_param:cluster_domain}
diff --git a/classes/cluster/sl-k8s-contrail/stacklight/server.yml b/classes/cluster/sl-k8s-contrail/stacklight/server.yml
index c33daf9..8dbe8d8 100644
--- a/classes/cluster/sl-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/sl-k8s-contrail/stacklight/server.yml
@@ -53,12 +53,12 @@
# Kibana
kibana_elasticsearch_host: ${_param:cluster_vip_address}
# Docker/Elasticsearch
- cluster_node01_hostname: ${_param:stacklight_node01_hostname}
- cluster_node01_address: ${_param:stacklight_node01_address}
- cluster_node02_hostname: ${_param:stacklight_node02_hostname}
- cluster_node02_address: ${_param:stacklight_node02_address}
- cluster_node03_hostname: ${_param:stacklight_node03_hostname}
- cluster_node03_address: ${_param:stacklight_node03_address}
+ cluster_node01_hostname: ${_param:stacklight_monitor_node01_hostname}
+ cluster_node01_address: ${_param:stacklight_monitor_node01_address}
+ cluster_node02_hostname: ${_param:stacklight_monitor_node02_hostname}
+ cluster_node02_address: ${_param:stacklight_monitor_node02_address}
+ cluster_node03_hostname: ${_param:stacklight_monitor_node03_hostname}
+ cluster_node03_address: ${_param:stacklight_monitor_node03_address}
influxdb_port: 8086
influxdb_admin_password: password
influxdb_stacklight_password: lmapass