From e98af3bfdf33e292f6f5640702da38f7c8116002 Mon Sep 17 00:00:00 2001 From: CLEMENT Iwan Date: Thu, 8 Nov 2018 20:12:19 +0100 Subject: [PATCH] Finalisation --- softwares/k8s.sls | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/softwares/k8s.sls b/softwares/k8s.sls index 2a01b86..fa28eeb 100644 --- a/softwares/k8s.sls +++ b/softwares/k8s.sls @@ -2,7 +2,8 @@ {% if grains['kernel'] == 'Linux' %} include: - - softwares.dockerCE + # - softwares.dockerCE + - linux.docker-ce {% if grains['os'] == 'Debian' %} {% set DEBVER = salt['grains.get']('oscodename') %} @@ -11,7 +12,8 @@ include: - name: deb https://apt.kubernetes.io/ kubernetes-{{DEBVER}} main - file: /etc/apt/sources.list.d/k8s.list - enable: 1 - - key_url: https://download.docker.com/linux/debian/gpg + - gpgkey: https://dl.google.com/linux/linux_signing_key.pub +# - key_url: https://download.docker.com/linux/debian/gpg {% endif %} K8S installation: