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/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}