Revert "Create k8s server certs directly on ctl nodes"
This reverts commit 8ad2959152a428c60faf86ba6f49a2635466f618.
Change-Id: Ibbf884173eaf0145f3e4de21f20dad9538138bd0
diff --git a/classes/cluster/sl-k8s-contrail/infra/config.yml b/classes/cluster/sl-k8s-contrail/infra/config.yml
index c94dd3d..bb5ad1f 100644
--- a/classes/cluster/sl-k8s-contrail/infra/config.yml
+++ b/classes/cluster/sl-k8s-contrail/infra/config.yml
@@ -9,6 +9,7 @@
- system.salt.minion.ca.salt_master
- system.salt.master.api
- system.reclass.storage.salt
+- system.salt.minion.cert.k8s_server
- system.reclass.storage.system.kubernetes_control_cluster
#- system.reclass.storage.system.opencontrail_control_cluster
- cluster.sl-k8s-contrail
diff --git a/classes/cluster/sl-k8s-contrail/kubernetes/control.yml b/classes/cluster/sl-k8s-contrail/kubernetes/control.yml
index 0ddfbda..7de9af4 100644
--- a/classes/cluster/sl-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/sl-k8s-contrail/kubernetes/control.yml
@@ -4,7 +4,6 @@
- system.keepalived.cluster.instance.kube_api_server_vip
- system.linux.system.repo.docker_legacy
- system.salt.minion.cert.etcd_server
-- system.salt.minion.cert.k8s_server
- system.kubernetes.master.cluster
- system.kubernetes.master.auth.rbac
- system.kubernetes.control.roles.cluster-admin