Refactor parameters for k8s-aio-calico model.
* Moved k8s parameters to init file.
* Moved virtlet addon to compute k8s nodes.
Change-Id: Id6b1d65529b62dbecc8c3f15c7fecaa2beabb75c
diff --git a/classes/cluster/k8s-aio-calico/infra/config.yml b/classes/cluster/k8s-aio-calico/infra/config.yml
index a9d6178..63034f6 100644
--- a/classes/cluster/k8s-aio-calico/infra/config.yml
+++ b/classes/cluster/k8s-aio-calico/infra/config.yml
@@ -5,10 +5,9 @@
- system.salt.master.pkg
- system.salt.minion.ca.salt_master
- system.salt.master.api
-- system.salt.minion.cert.k8s_server
-- system.mysql.client
+- system.salt.minion.cert.k8s_server_single
- system.reclass.storage.salt
-- system.reclass.storage.system.kubernetes_control_cluster
+- system.reclass.storage.system.kubernetes_control_single
- cluster.k8s-aio-calico
parameters:
_param:
@@ -17,6 +16,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
@@ -37,6 +37,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:
@@ -44,23 +46,20 @@
value_template: <<node_control_ip>>
infra_config_deploy_address:
value_template: <<node_deploy_ip>>
+ cluster_domain:
+ value_template: <<node_domain>>
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_control_node01_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>>
diff --git a/classes/cluster/k8s-aio-calico/infra/init.yml b/classes/cluster/k8s-aio-calico/infra/init.yml
index d6c546e..9d3b5c0 100644
--- a/classes/cluster/k8s-aio-calico/infra/init.yml
+++ b/classes/cluster/k8s-aio-calico/infra/init.yml
@@ -12,8 +12,8 @@
infra_config_address: 172.16.10.100
infra_config_deploy_address: 192.168.10.90
- cluster_domain: virtual-mcp11-k8s-calico.local
- cluster_name: virtual-mcp11-k8s-calico
+ cluster_domain: k8s-aio-calico.local
+ cluster_name: k8s-aio-calico
apt_mk_version: nightly
primary_interface: ens3
linux:
@@ -24,15 +24,6 @@
names:
- ${_param:infra_config_hostname}
- ${_param:infra_config_hostname}.${_param:cluster_domain}
- interface:
- primary_interface:
- enabled: true
- type: eth
- proto: dhcp
- #proto: static
- #name: ${_param:primary_interface}
- #address: ${_param:single_address}
- #netmask: 255.255.255.0
system:
name: ${_param:infra_config_hostname}
domain: ${_param:cluster_domain}