Sync sl-k8s-calico model with virtual-mcp11-k8s-calico
Change-Id: Ie3ac2560746f33a6d02a44baeaa8175dadff25b7
diff --git a/classes/cluster/sl-k8s-calico/infra/init.yml b/classes/cluster/sl-k8s-calico/infra/init.yml
index b585338..270fec0 100644
--- a/classes/cluster/sl-k8s-calico/infra/init.yml
+++ b/classes/cluster/sl-k8s-calico/infra/init.yml
@@ -2,20 +2,18 @@
- system.linux.system.single
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.mcp.salt
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
- system.openssh.server.team.all
- system.rsyslog.client.single
parameters:
- _jenkins:
- tests_enabled: false
_param:
# infra service addresses
infra_config_hostname: cfg01
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: sl-k8s-calico.local
+ cluster_name: sl-k8s-calico
apt_mk_version: nightly
primary_interface: ens3
linux:
@@ -26,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}