commit 22f1f031e791299584eb443b2a7a7a0a6b45e038
author Mateusz Matuszkowiak <mmatuszkowiak@mirantis.com> Mon Aug 20 13:32:15 2018 +0200
committer Mateusz Matuszkowiak <mmatuszkowiak@mirantis.com> Tue Aug 21 10:12:02 2018 +0200
tree 81f7680da8001de2fc210b87e4d08c03a1b3982e
parent f14b0f4d72f6c5aef486c3bec78b3433a7b04d03

Changed IPs for ctl nodes and computes

Change-Id: I03993b4402d5baa5091bff1239b3398c3234da04
Related-Bug: PROD-21872

classes/cluster/sl-k8s-calico/kubernetes/init.yml

diff --git a/classes/cluster/sl-k8s-calico/kubernetes/init.yml b/classes/cluster/sl-k8s-calico/kubernetes/init.yml
index 9575ee9..337d7fd 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/init.yml
@@ -16,7 +16,6 @@
     kubernetes_controller-manager_token: uXrdZ1YKF6qlYm3sHje2iEXMGAGDWOIU
     kubernetes_dns_token: 0S1I4iJeFjq5fopPwwCwTp3xFpEZfeUl
     kubernetes_mtu: 1500
-    mcp_version: testing
     etcd_initial_token: IN7KaRMSo3xkGxkjAAPtkRkAgqN4ZNRq
 
     # docker package version
@@ -40,7 +39,10 @@
     kubernetes_metallb_addresses_pool: 172.16.10.60-172.16.10.80
 
     # switches of addons
-    kubernetes_helm_enabled: true
+    kubernetes_addon_namespace: kube-system
+    kubernetes_dns: true
+    kubernetes_dashboard: true
+    kubernetes_helm_enabled: false
     kubernetes_netchecker_enabled: true
     kubernetes_calico_policy_enabled: false
     kubernetes_virtlet_enabled: false
@@ -67,11 +69,12 @@
     kubernetes_control_node03_deploy_address: 192.168.10.103
     kubernetes_compute_node01_deploy_address: 192.168.10.105
     kubernetes_compute_node02_deploy_address: 192.168.10.106
+
     kubernetes_proxy_node01_hostname: prx01
     kubernetes_proxy_node01_address: 172.16.10.121
 
     cluster_vip_address: ${_param:kubernetes_control_address}
-    cluster_local_address: ${_param:single_address}
+    cluster_local_address: ${_param:deploy_address}
 
     # etcd stuff
     cluster_node01_hostname: ${_param:kubernetes_control_node01_hostname}
@@ -131,3 +134,16 @@
         root:
           name: root
           password: false
+      rc:
+        local: |
+          #!/bin/sh -e
+          #
+          # rc.local
+          #
+          ######### This file is managed by Salt! ##########
+          # This script is executed at the end of each multiuser runlevel.
+          # Make sure that the script will "exit 0" on success or any other
+          # value on error.
+          #
+          ip r a 10.254.0.0/16 dev ens4
+          exit 0