paramaters for different upstream repos and OS flavors

manifests/init.pp

@@ -174,6 +174,7 @@
   String $kubernetes_package_version                               = $kubernetes::params::kubernetes_package_version,
   String $container_runtime                                        = $kubernetes::params::container_runtime,
   Optional[String] $containerd_version                             = $kubernetes::params::containerd_version,
+  Optional[String] $docker_package_name                            = $kubernetes::params::docker_package_name,
   Optional[String] $docker_version                                 = $kubernetes::params::docker_version,
   Optional[String] $cni_pod_cidr                                   = $kubernetes::params::cni_pod_cidr,
   Boolean $controller                                              = $kubernetes::params::controller,
@@ -214,12 +215,14 @@
   String $etcd_source                                              = $kubernetes::params::etcd_source,
   Optional[String] $kubernetes_apt_location                        = $kubernetes::params::kubernetes_apt_location,
   Optional[String] $kubernetes_apt_release                         = $kubernetes::params::kubernetes_apt_release,
+  Optional[String] $kubernetes_apt_repos                           = $kubernetes::params::kubernetes_apt_repos,
   Optional[String] $kubernetes_key_id                              = $kubernetes::params::kubernetes_key_id,
   Optional[String] $kubernetes_key_source                          = $kubernetes::params::kubernetes_key_source,
   Optional[String] $kubernetes_yum_baseurl                         = $kubernetes::params::kubernetes_yum_baseurl,
   Optional[String] $kubernetes_yum_gpgkey                          = $kubernetes::params::kubernetes_yum_gpgkey,
   Optional[String] $docker_apt_location                            = $kubernetes::params::docker_apt_location,
   Optional[String] $docker_apt_release                             = $kubernetes::params::docker_apt_release,
+  Optional[String] $docker_apt_repos                               = $kubernetes::params::docker_apt_repos,
   Optional[String] $docker_yum_baseurl                             = $kubernetes::params::docker_yum_baseurl,
   Optional[String] $docker_yum_gpgkey                              = $kubernetes::params::docker_yum_gpgkey,
   Optional[String] $docker_key_id                                  = $kubernetes::params::docker_key_id,

manifests/packages.pp

@@ -5,6 +5,7 @@
   String $kubernetes_package_version           = $kubernetes::kubernetes_package_version,
   String $container_runtime                    = $kubernetes::container_runtime,
   Optional[String] $docker_version             = $kubernetes::docker_version,
+  Optional[String] $docker_package_name        = $kubernetes::docker_package_name,
   Boolean $controller                          = $kubernetes::controller,
   Optional[String] $containerd_archive         = $kubernetes::containerd_archive,
   Optional[String] $containerd_source          = $kubernetes::containerd_source,
@@ -37,19 +38,19 @@
   if $container_runtime == 'docker' {
     case $::osfamily {
       'Debian': {
-        package { 'docker-engine':
+        package { $docker_package_name:
           ensure => $docker_version,
         }
       }
       'RedHat': {
-        package { 'docker-engine':
+        package { $docker_package_name:
           ensure => $docker_version,
         }
         file_line { 'set systemd cgroup docker':
           path    => '/usr/lib/systemd/system/docker.service',
           line    => 'ExecStart=/usr/bin/dockerd --exec-opt native.cgroupdriver=systemd',
           match   => 'ExecStart',
-          require => Package['docker-engine'],
+          require => Package[$docker_package_name],
         }
       }
     default: { notify {"The OS family ${::osfamily} is not supported by this module":} }

manifests/params.pp

@@ -18,6 +18,7 @@
 $containerd_version = '1.1.0'
 $containerd_archive = "containerd-${containerd_version}.linux-amd64.tar.gz"
 $containerd_source = "https://github.com/containerd/containerd/releases/download/v${containerd_version}/${containerd_archive}"
+$docker_package_name = 'docker-engine'
 $etcd_version = '3.1.12'
 $etcd_archive = "etcd-v${etcd_version}-linux-amd64.tar.gz"
 $etcd_source = "https://github.com/coreos/etcd/releases/download/v${etcd_version}/${etcd_archive}"
@@ -56,15 +57,16 @@
 $service_cidr = '10.96.0.0/12'
 $controller_address = undef
 $cloud_provider = undef
-$os_codename = $facts['os']['distro']['codename']
 $kubernetes_apt_location = 'http://apt.kubernetes.io'
-$kubernetes_apt_release = "kubernetes-${os_codename}"
+$kubernetes_apt_release = "kubernetes-${::lsbdistcodename}"
+$kubernetes_apt_repos = 'main'
 $kubernetes_key_id = '54A647F9048D5688D7DA2ABE6A030B21BA07F4FB'
 $kubernetes_key_source = 'https://packages.cloud.google.com/apt/doc/apt-key.gpg'
 $kubernetes_yum_baseurl = 'https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64'
 $kubernetes_yum_gpgkey = 'https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg'
 $docker_apt_location = 'https://apt.dockerproject.org/repo'
-$docker_apt_release = "ubuntu-${os_codename}"
+$docker_apt_release = "ubuntu-${::lsbdistcodename}"
+$docker_apt_repos = 'main'
 $docker_yum_baseurl = 'https://yum.dockerproject.org/repo/main/centos/7'
 $docker_yum_gpgkey = 'https://yum.dockerproject.org/gpg'
 $docker_key_id = '58118E89F3A912897C070ADBF76221572C52609D'

manifests/repos.pp

@@ -4,25 +4,28 @@
   String $container_runtime                 = $kubernetes::container_runtime,
   Optional[String] $kubernetes_apt_location = $kubernetes::kubernetes_apt_location,
   Optional[String] $kubernetes_apt_release  = $kubernetes::kubernetes_apt_release,
+  Optional[String] $kubernetes_apt_repos    = $kubernetes::kubernetes_apt_repos,
   Optional[String] $kubernetes_key_id       = $kubernetes::kubernetes_key_id,
   Optional[String] $kubernetes_key_source   = $kubernetes::kubernetes_key_source,
   Optional[String] $kubernetes_yum_baseurl  = $kubernetes::kubernetes_yum_baseurl,
   Optional[String] $kubernetes_yum_gpgkey   = $kubernetes::kubernetes_yum_gpgkey,
   Optional[String] $docker_apt_location     = $kubernetes::docker_apt_location,
   Optional[String] $docker_apt_release      = $kubernetes::docker_apt_release,
+  Optional[String] $docker_apt_repos        = $kubernetes::docker_apt_repos,
   Optional[String] $docker_yum_baseurl      = $kubernetes::docker_yum_baseurl,
   Optional[String] $docker_yum_gpgkey       = $kubernetes::docker_yum_gpgkey,
   Optional[String] $docker_key_id           = $kubernetes::docker_key_id,
   Optional[String] $docker_key_source       = $kubernetes::docker_key_source,
   Boolean $create_repos                     = $kubernetes::create_repos,
 
+
 ){
   if $create_repos {
     case $::osfamily  {
       'Debian': {
         apt::source { 'kubernetes':
           location => $kubernetes_apt_location,
-          repos    => 'main',
+          repos    => $kubernetes_apt_repos,
           release  => $kubernetes_apt_release,
           key      => {
             'id'     => $kubernetes_key_id,
@@ -33,7 +36,7 @@
           if $container_runtime == 'docker' {
             apt::source { 'docker':
               location => $docker_apt_location,
-              repos    => 'main',
+              repos    => $docker_apt_repos,
               release  => $docker_apt_release,
               key      => {
                 'id'     => $docker_key_id,

spec/classes/cluster_roles_spec.rb

@@ -4,16 +4,14 @@
         {
           :hostname         => 'foo',
           :kernel           => 'Linux',
+          :lsbdistcodename  => 'xenial',
           :osfamily         => 'Debian',
           :operatingsystem  => 'Ubuntu',
           :os               => {
             :name    => 'Ubuntu',
             :release => {
               :full => '16.04',
             },
-            :distro => {
-              :codename => 'xenial',
-            },
           },
         }
       end
@@ -22,7 +20,6 @@
     let(:params) do 
         { 
           'controller' => true, 
-          # 'kubernetes_version' => '1.10.2',
           'worker' => false,
           'etcd_ip' => 'foo',           
           'etcd_ca_key' => 'foo',
@@ -48,7 +45,6 @@
     let(:params) do 
         { 
           'controller' => false, 
-          # 'kubernetes_version' => '1.10.2',
           'worker' => true,
           'etcd_ip' => 'foo',           
           'etcd_ca_key' => 'foo',
@@ -63,8 +59,8 @@
           'etcd_initial_cluster' => 'foo',   
           'controller_address' => '172.17.10.101',  
           'node_label' => 'foo',   
-          'container_runtime' => 'docker',     
-                                                 
+          'container_runtime' => 'docker',  
+          # 'docker_package_name' => 'docker-engine',   
         } 
     end
 

spec/classes/init_spec.rb

@@ -3,16 +3,15 @@
   let(:facts) do
     {
       :kernel           => 'Linux',
+      :lsbdistcodename  => 'xenial',
       :osfamily         => 'Debian',
       :operatingsystem  => 'Ubuntu',
       :os               => {
         :name    => 'Ubuntu',
         :release => {
           :full => '16.04',
         },
-        :distro => {
-          :codename => 'xenial',
-        },        
+
       },
     }
   end

spec/classes/kube_addons_spec.rb

@@ -2,16 +2,14 @@
 describe 'kubernetes::kube_addons', :type => :class do
   let(:facts) do
     {
+      :lsbdistcodename  => 'xenial',
       :osfamily         => 'Debian',
       :operatingsystem  => 'Ubuntu',
       :os               => {
         :name    => 'Ubuntu',
         :release => {
           :full => '16.04',
-        },
-        :distro => {
-          :codename => 'xenial',
-        },        
+        },    
       },
     }
   end

spec/classes/packages_spec.rb

@@ -3,6 +3,7 @@
   context 'with osfamily => RedHat and container_runtime => Docker' do
     let(:facts) do
         {
+          :lsbdistcodename  => 'xenial',
           :kernel           => 'Linux',
           :osfamily         => 'RedHat',
           :operatingsystem  => 'RedHat',
@@ -25,6 +26,7 @@
         'etcd_source' => 'https://github.com/etcd-v3.1.12.tar.gz',
         'runc_source' => 'https://github.com/runcsource',
         'controller' => true,
+        'docker_package_name' => 'docker-engine',   
         }
     end
 
@@ -61,7 +63,8 @@
         'etcd_archive' => 'etcd-v3.1.12-linux-amd64.tar.gz',
         'etcd_source' => 'https://github.com/etcd-v3.1.12.tar.gz',
         'runc_source' => 'https://github.com/runcsource',
-        'controller' => true,        
+        'controller' => true, 
+        'docker_package_name' => 'docker-engine',   
         }
     end
 

spec/classes/repos_spec.rb

@@ -5,16 +5,14 @@
   context 'with osfamily => Ubuntu' do
     let(:facts) do
       {
+        :lsbdistcodename  => 'xenial',
         :operatingsystem => 'Ubuntu',
         :osfamily => 'Debian',
         :os               => {
           :name    => 'Ubuntu',
           :release => {
             :full => '16.04',
-          },
-          :distro => {
-            :codename => 'xenial',
-          },          
+          },        
         },
       }
     end
@@ -24,12 +22,14 @@
          'container_runtime' => 'docker',
          'kubernetes_apt_location' => 'http://apt.kubernetes.io',
          'kubernetes_apt_release' => 'kubernetes-xenial',
+         'kubernetes_apt_repos' => 'main',
          'kubernetes_key_id' => '54A647F9048D5688D7DA2ABE6A030B21BA07F4FB',
          'kubernetes_key_source' => 'https://packages.cloud.google.com/apt/doc/apt-key.gpg',
          'kubernetes_yum_baseurl' => 'https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64',
          'kubernetes_yum_gpgkey' => 'https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg',
          'docker_apt_location' => 'https://apt.dockerproject.org/repo',
-         'docker_apt_release' => "ubuntu-xenial",
+         'docker_apt_release' => 'ubuntu-xenial',
+         'docker_apt_repos' => 'main',
          'docker_yum_baseurl' => 'https://yum.dockerproject.org/repo/main/centos/7',
          'docker_yum_gpgkey' => 'https://yum.dockerproject.org/gpg',
          'docker_key_id' => '58118E89F3A912897C070ADBF76221572C52609D',
@@ -70,12 +70,14 @@
         'container_runtime' => 'docker',
         'kubernetes_apt_location' => 'http://apt.kubernetes.io',
         'kubernetes_apt_release' => 'kubernetes-xenial',
+        'kubernetes_apt_repos' => 'main',
         'kubernetes_key_id' => '54A647F9048D5688D7DA2ABE6A030B21BA07F4FB',
         'kubernetes_key_source' => 'https://packages.cloud.google.com/apt/doc/apt-key.gpg',
         'kubernetes_yum_baseurl' => 'https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64',
         'kubernetes_yum_gpgkey' => 'https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg',
         'docker_apt_location' => 'https://apt.dockerproject.org/repo',
-        'docker_apt_release' => "ubuntu-xenial",
+        'docker_apt_release' => 'ubuntu-xenial',
+        'docker_apt_repos' => 'main',
         'docker_yum_baseurl' => 'https://yum.dockerproject.org/repo/main/centos/7',
         'docker_yum_gpgkey' => 'https://yum.dockerproject.org/gpg',
         'docker_key_id' => '58118E89F3A912897C070ADBF76221572C52609D',

spec/defines/kubeadm_init_spec.rb

@@ -4,16 +4,14 @@
   let(:title) { 'kubeadm init' }
   let(:facts) do
     {
+      :lsbdistcodename  => 'xenial',
       :osfamily         => 'Debian',
       :operatingsystem  => 'Ubuntu',
       :os               => {
         :name    => 'Ubuntu',
         :release => {
           :full => '16.04',
-        },
-        :distro => {
-          :codename => 'xenial',
-        },        
+        },     
       },
     }
   end  

spec/defines/kubeadm_join_spec.rb

@@ -4,19 +4,17 @@
   let(:title) { 'kubeadm join' }
   let(:facts) do
     {
+      :lsbdistcodename  => 'xenial',
       :osfamily         => 'Debian',
       :operatingsystem  => 'Ubuntu',
       :os               => {
         :name    => 'Ubuntu',
         :release => {
           :full => '16.04',
-        },
-        :distro => {
-          :codename => 'xenial',
-        },        
+        },     
       },
     }
-  end  
+  end   
 
  context 'with controller_address => 10.0.0.1:6443' do
   let(:params) { {