Refactor parameters for k8s-ha-calico model.
* Moved k8s parameters to init file.
* Moved virtlet addon to compute k8s nodes.
* Moved k8s router from ens4 to ens3
Change-Id: I325dcabad7a4b9c062ca2765d9d9643052ca0327
diff --git a/classes/cluster/k8s-ha-calico/infra/config.yml b/classes/cluster/k8s-ha-calico/infra/config.yml
index 04e2380..d452b0a 100644
--- a/classes/cluster/k8s-ha-calico/infra/config.yml
+++ b/classes/cluster/k8s-ha-calico/infra/config.yml
@@ -15,6 +15,7 @@
reclass_data_revision: master
reclass_config_master: ${_param:infra_config_deploy_address}
single_address: ${_param:infra_config_address}
+ deploy_address: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
salt_master_host: 127.0.0.1
@@ -25,16 +26,6 @@
reactor:
reclass/minion/classify:
- salt://reclass/reactor/node_register.sls
- environment:
- # TODO: remove formulas in development once they are stable and part of shared the system-level reclass
- prd:
- formula:
- helm:
- source: pkg
- name: salt-formula-helm
- #source: git
- #address: '${_param:salt_master_environment_repository}/salt-formula-helm.git'
- #revision: ${_param:salt_master_environment_revision}
reclass:
storage:
class_mapping:
@@ -47,6 +38,8 @@
value_template: <<node_os>>
salt_master_host:
value_template: <<node_master_ip>>
+ deploy_address:
+ value_template: <<node_deploy_ip>>
infra_config:
expression: <<node_hostname>>__startswith__cfg
cluster_param:
@@ -61,18 +54,27 @@
cluster_param:
kubernetes_control_node01_address:
value_template: <<node_control_ip>>
+ kubernetes_control_node01_deploy_address:
+ value_template: <<node_deploy_ip>>
kubernetes_control02:
expression: <<node_hostname>>__equals__ctl02
cluster_param:
kubernetes_control_node02_address:
value_template: <<node_control_ip>>
+ kubernetes_control_node02_deploy_address:
+ value_template: <<node_deploy_ip>>
kubernetes_control03:
expression: <<node_hostname>>__equals__ctl03
cluster_param:
kubernetes_control_node03_address:
value_template: <<node_control_ip>>
+ kubernetes_control_node03_deploy_address:
+ value_template: <<node_deploy_ip>>
kubernetes_compute:
expression: <<node_hostname>>__startswith__cmp
node_class:
value_template:
- cluster.<<node_cluster>>.kubernetes.compute
+ node_param:
+ deploy_address:
+ value_template: <<node_deploy_ip>>