From 7c8be652e7def5b30eabf58dd0e4a71ea0bc3e01 Mon Sep 17 00:00:00 2001
From: nhaveric <nedim.haveric@polyconseil.fr>
Date: Thu, 2 Mar 2017 17:26:32 +0100
Subject: [PATCH] make-ssl: resolved merge conflict

---
 roles/kubernetes/secrets/files/make-ssl.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/roles/kubernetes/secrets/files/make-ssl.sh b/roles/kubernetes/secrets/files/make-ssl.sh
index 0e904bbb8..2e1c1cb97 100755
--- a/roles/kubernetes/secrets/files/make-ssl.sh
+++ b/roles/kubernetes/secrets/files/make-ssl.sh
@@ -96,13 +96,8 @@ if [ -n "$HOSTS" ]; then
         cn="${host%%.*}"
         # node key
         openssl genrsa -out node-${host}-key.pem 2048 > /dev/null 2>&1
-<<<<<<< 24b9734e1ae72abeb39d9cef1b6a374867810c46
-        openssl req -new -key node-${host}-key.pem -out node-${host}.csr -subj "/CN=kube-node-${cn}" > /dev/null 2>&1
-        openssl x509 -req -in node-${host}.csr -CA ca.pem -CAkey ca-key.pem -CAcreateserial -out node-${host}.pem -days 3650 > /dev/null 2>&1
-=======
         openssl req -new -key node-${host}-key.pem -out node-${host}.csr -subj "/CN=kube-node-${cn}/O=system:node" > /dev/null 2>&1
         openssl x509 -req -in node-${host}.csr -CA ca.pem -CAkey ca-key.pem -CAcreateserial -out node-${host}.pem -days 365 > /dev/null 2>&1
->>>>>>> add system groups to certificates
     done
 fi