commit 4e9bf573627f3c07a225b39e013fa751ca765426
author Victor Ryzhenkin <vryzhenkin@mirantis.com> Thu Dec 20 00:43:16 2018 +0400
committer Victor Ryzhenkin <vryzhenkin@mirantis.com> Sun Dec 23 23:02:32 2018 +0000
tree b85f71f550377dc6c15f3d1e986fc12df0aac639
parent 5dc6b66c33d2f39ea141a3a116d7e3f388358e5d

Update k8s-ha-* models

Related-PROD: PROD-25976
Change-Id: Id31e6604c71534086e90b63ae1c0cf3a319ec0b8

classes/cluster/k8s-ha-calico/kubernetes/compute.yml

diff --git a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
index 994ae35..a82e22c 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
@@ -1,16 +1,12 @@
 classes:
-- system.linux.system.repo.docker
-- system.kubernetes.pool.cluster
 - system.linux.network.hosts
-- system.salt.minion.cert.k8s_client
-- system.salt.minion.cert.etcd_client
-- cluster.k8s-ha-calico
+- cluster.k8s-ha-calico.kubernetes.common
+- cluster.k8s-ha-calico.kubernetes.networking.virtual
+- cluster.k8s-ha-calico.infra
+
 parameters:
   kubernetes:
     pool:
-      proxy:
-        daemon_opts:
-          cluster-cidr: ${_param:calico_private_network}/${_param:calico_private_netmask}
       kubelet:
         address: ${_param:single_address}
         fail_on_swap: ${_param:kubelet_fail_on_swap}
@@ -26,44 +22,3 @@
               enabled: true
           policy:
             enabled: ${_param:kubernetes_calico_policy_enabled}
-    common:
-      addons:
-        virtlet:
-          enabled: ${_param:kubernetes_virtlet_enabled}
-          namespace: ${_param:kubernetes_addon_namespace}
-          image: ${_param:kubernetes_virtlet_image}
-          criproxy_version: ${_param:kubernetes_criproxy_version}
-          criproxy_source: ${_param:kubernetes_criproxy_checksum}
-          hosts:
-          - ${_param:kubernetes_compute01_hostname}
-      hyperkube:
-        image: ${_param:kubernetes_hyperkube_image}
-        pause_image: ${_param:kubernetes_pause_image}
-  linux:
-    network:
-      resolv:
-        dns:
-          - 172.18.208.44
-          - 172.18.176.4
-          - 10.254.0.10
-        search:
-          - ${_param:cluster_domain}
-      interface:
-        ens3:
-          enabled: true
-          type: eth
-          proto: static
-          name: ${_param:primary_interface}
-          address: ${_param:deploy_address}
-          netmask: 255.255.255.0
-          gateway: 192.168.10.1
-          post_up_cmds:
-            - ip r rep 10.254.0.0/16 via ${_param:deploy_address}
-        ens4:
-          enabled: true
-          type: eth
-          proto: static
-          address: ${_param:single_address}
-          netmask: '255.255.255.0'
-          ipflush_onchange: true
-          restart_on_ipflush: true