Revert "Update sl_k8s_calico models"
This reverts commit e048a839e5d62dab349a5cf20fc9c2886add175f.
Change-Id: Ic03d0e11deabca745a2601ef191acb56e77841b7
diff --git a/classes/cluster/sl_k8s_calico/infra/config.yml b/classes/cluster/sl_k8s_calico/infra/config.yml
index 997b07e..88dcede 100644
--- a/classes/cluster/sl_k8s_calico/infra/config.yml
+++ b/classes/cluster/sl_k8s_calico/infra/config.yml
@@ -1,4 +1,6 @@
classes:
+- system.docker.client
+- system.docker.host
- system.linux.system.repo.ubuntu
- system.openssh.client.lab
- system.salt.master.pkg
@@ -9,7 +11,8 @@
- system.mysql.client.database.grafana
- system.reclass.storage.salt
- system.reclass.storage.system.kubernetes_control_cluster
-- cluster.sl_k8s_calico.infra
+- cluster.sl_k8s_calico.stacklight.proxy
+- cluster.sl_k8s_calico
parameters:
_param:
salt_master_base_environment: prd
@@ -19,39 +22,76 @@
single_address: ${_param:infra_config_address}
linux_system_codename: xenial
salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
- salt_master_host: ${_param:infra_config_deploy_address}
+ salt_master_host: 127.0.0.1
+ salt:
+ master:
+ reactor:
+ reclass/minion/classify:
+ - salt://reclass/reactor/node_register.sls
reclass:
storage:
+ class_mapping:
+ common_node:
+ expression: all
+ node_param:
+ single_address:
+ value_template: <<node_control_ip>>
+ linux_system_codename:
+ value_template: <<node_os>>
+ salt_master_host:
+ value_template: <<node_master_ip>>
+ infra_config:
+ expression: <<node_hostname>>__startswith__cfg
+ cluster_param:
+ infra_config_address:
+ value_template: <<node_control_ip>>
+ infra_config_deploy_address:
+ value_template: <<node_deploy_ip>>
+ cluster_domain:
+ value_template: <<node_domain>>
+ infra_proxy:
+ expression: <<node_hostname>>__startswith__prx
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.stacklight.proxy
+ kubernetes_control01:
+ expression: <<node_hostname>>__equals__ctl01
+ cluster_param:
+ kubernetes_control_node01_address:
+ value_template: <<node_control_ip>>
+ kubernetes_control02:
+ expression: <<node_hostname>>__equals__ctl02
+ cluster_param:
+ kubernetes_control_node02_address:
+ value_template: <<node_control_ip>>
+ kubernetes_control03:
+ expression: <<node_hostname>>__equals__ctl03
+ cluster_param:
+ kubernetes_control_node03_address:
+ value_template: <<node_control_ip>>
+ kubernetes_compute:
+ expression: <<node_hostname>>__startswith__cmp
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.kubernetes.compute
+ stacklight_monitor01:
+ expression: <<node_hostname>>__equals__mon01
+ cluster_param:
+ stacklight_monitor_node01_address:
+ value_template: <<node_control_ip>>
+ stacklight_monitor02:
+ expression: <<node_hostname>>__equals__mon02
+ cluster_param:
+ stacklight_monitor_node02_address:
+ value_template: <<node_control_ip>>
+ stacklight_monitor03:
+ expression: <<node_hostname>>__equals__mon03
+ cluster_param:
+ stacklight_monitor_node03_address:
+ value_template: <<node_control_ip>>
node:
- kubernetes_compute_node01:
- name: ${_param:kubernetes_compute_node01_hostname}
- domain: ${_param:cluster_domain}
- classes:
- - cluster.${_param:cluster_name}.kubernetes.compute
- params:
- salt_master_host: ${_param:infra_config_deploy_address}
- linux_system_codename: xenial
- single_address: ${_param:kubernetes_compute_node01_address}
- kubernetes_compute_node02:
- name: ${_param:kubernetes_compute_node02_hostname}
- domain: ${_param:cluster_domain}
- classes:
- - cluster.${_param:cluster_name}.kubernetes.compute
- params:
- salt_master_host: ${_param:infra_config_deploy_address}
- linux_system_codename: xenial
- single_address: ${_param:kubernetes_compute_node02_address}
- prx_node:
- name: ${_param:kubernetes_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:kubernetes_proxy_node01_address}
- stacklight_node01:
- name: ${_param:stacklight_node01_hostname}
+ stacklight_monitor_node01:
+ name: ${_param:stacklight_monitor_node01_hostname}
domain: ${_param:cluster_domain}
classes:
- service.galera.master.cluster
@@ -61,11 +101,11 @@
params:
salt_master_host: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
- single_address: ${_param:stacklight_node01_address}
+ single_address: ${_param:stacklight_monitor_node01_address}
keepalived_vip_priority: 100
mysql_cluster_role: master
- stacklight_node02:
- name: ${_param:stacklight_node02_hostname}
+ stacklight_monitor_node02:
+ name: ${_param:stacklight_monitor_node02_hostname}
domain: ${_param:cluster_domain}
classes:
- service.galera.slave.cluster
@@ -74,11 +114,11 @@
params:
salt_master_host: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
- single_address: ${_param:stacklight_node02_address}
+ single_address: ${_param:stacklight_monitor_node02_address}
keepalived_vip_priority: 101
mysql_cluster_role: slave
- stacklight_node03:
- name: ${_param:stacklight_node03_hostname}
+ stacklight_monitor_node03:
+ name: ${_param:stacklight_monitor_node03_hostname}
domain: ${_param:cluster_domain}
classes:
- service.galera.slave.cluster
@@ -87,6 +127,7 @@
params:
salt_master_host: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
- single_address: ${_param:stacklight_node03_address}
+ single_address: ${_param:stacklight_monitor_node03_address}
keepalived_vip_priority: 102
mysql_cluster_role: slave
+