commit 891b03e15212275c4114972b79f66792d741c11b
author Andrey Shestakov <ashestakov@mirantis.com> Tue Jul 31 16:03:48 2018 +0300
committer Andrey Shestakov <ashestakov@mirantis.com> Wed Aug 01 18:01:52 2018 +0300
tree 7296c51af04b0882b2fb8b3eff715b2828193a91
parent 7259a78b010ec39096d0f067a9366ab1c1222df7

Add k8s ctl nodes to salt.control

Fixes PROD-21874

Change-Id: Ib690f8c4a0d615a9cd4cbc2956a725f28f33ac7e

salt/control/cluster/kubernetes_control_cluster.yml

diff --git a/salt/control/cluster/kubernetes_control_cluster.yml b/salt/control/cluster/kubernetes_control_cluster.yml
new file mode 100644
index 0000000..c3049ec
--- /dev/null
+++ b/salt/control/cluster/kubernetes_control_cluster.yml
@@ -0,0 +1,29 @@
+parameters:
+  salt:
+    control:
+      size:
+        kubernetes.control:
+          cpu: 4
+          ram: 8192
+          disk_profile: small
+          net_profile: default
+      cluster:
+        internal:
+          domain: ${_param:cluster_domain}
+          engine: virt
+          node:
+            ctl01:
+              name: ${_param:kubernetes_control_node01_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              size: kubernetes.control
+            ctl02:
+              name: ${_param:kubernetes_control_node02_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              size: kubernetes.control
+            ctl03:
+              name: ${_param:kubernetes_control_node03_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              size: kubernetes.control

salt/control/cluster/kubernetes_proxy_cluster.yml

diff --git a/salt/control/cluster/kubernetes_proxy_cluster.yml b/salt/control/cluster/kubernetes_proxy_cluster.yml
index d4251a2..379a333 100644
--- a/salt/control/cluster/kubernetes_proxy_cluster.yml
+++ b/salt/control/cluster/kubernetes_proxy_cluster.yml
@@ -3,8 +3,8 @@
     control:
       size:
         kubernetes.proxy:
-          cpu: 32
-          ram: 65536
+          cpu: 2
+          ram: 4096
           disk_profile: small
           net_profile: default
       cluster:
@@ -15,11 +15,11 @@
             prx01:
               name: ${_param:kubernetes_proxy_node01_hostname}
               provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
-              image: ${_param:salt_control_trusty_image}
+              image: ${_param:salt_control_xenial_image}
               size: kubernetes.proxy
             prx02:
               name: ${_param:kubernetes_proxy_node02_hostname}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
-              image: ${_param:salt_control_trusty_image}
+              image: ${_param:salt_control_xenial_image}
               size: kubernetes.proxy