StackLight K8S Calico model fixes
Change-Id: I11048edb42d83ab8a1ece6261e1e17957d7d34ce
diff --git a/classes/cluster/sl_k8s_calico/infra/config.yml b/classes/cluster/sl_k8s_calico/infra/config.yml
index 596d18f..9108b97 100644
--- a/classes/cluster/sl_k8s_calico/infra/config.yml
+++ b/classes/cluster/sl_k8s_calico/infra/config.yml
@@ -9,6 +9,7 @@
- system.mysql.client.database.grafana
- system.reclass.storage.salt
- system.reclass.storage.system.kubernetes_control_cluster
+- cluster.sl_k8s_calico.stacklight.proxy
- cluster.sl_k8s_calico
parameters:
_param:
@@ -87,12 +88,44 @@
stacklight_node03_address:
value_template: <<node_control_ip>>
node:
- prx_node:
- name: ${_param:kubernetes_proxy_node01_hostname}
+ stacklight_node01:
+ name: ${_param:stacklight_node01_hostname}
domain: ${_param:cluster_domain}
classes:
- - cluster.${_param:cluster_name}.stacklight.proxy
+ - service.galera.master.cluster
+ - 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:kubernetes_proxy_node01_address}
+ single_address: ${_param:stacklight_node01_address}
+ keepalived_vip_priority: 100
+ mysql_cluster_role: master
+ stacklight_node02:
+ name: ${_param:stacklight_node02_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - service.galera.slave.cluster
+ - 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_node02_address}
+ keepalived_vip_priority: 101
+ mysql_cluster_role: slave
+ stacklight_node03:
+ name: ${_param:stacklight_node03_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - service.galera.slave.cluster
+ - 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_node03_address}
+ keepalived_vip_priority: 102
+ mysql_cluster_role: slave
+