Cloud 1528 (#129)

* removing obsolete code

* fixing acceptance tests

* incorporating updates from markw/puppetlabs-docker

* fixing params

* putting in systemd default for run on redhat

* removing old variable

* removing archilunx template

* updating last of the spec tests

Author: davejrt

CONTRIBUTING.md

@@ -71,14 +71,18 @@ This fires up a new virtual machine (using vagrant) and runs a series of
 simple tests against it after applying the module. You can run this
 with:
 
-    bundle exec rake beaker
-
-This will run the tests on an Ubuntu 12.04 virtual machine. You can also
-run the integration tests against Centos 6.5 with:
-
-    BEAKER_set=centos-70-x64 bundle exec rake beaker
-
-Or with Ubuntu 14.04 with:
-
-    BEAKER_set=ubuntu-1404-x64 bundle exec rake beaker
+    bundle exec rake acceptance
+
+This will run the tests on an Ubuntu 16.04 virtual machine. You can also
+run the integration tests against RHEL, CentOS and Debian.
+
+    bundle exec rake acceptance:pooler:centos7
+    bundle exec rake acceptance:pooler:rhel7
+    bundle exec rake acceptance:pooler:ubuntu-1404
+    bundle exec rake acceptance:pooler:ubuntu-1604
+    bundle exec rake acceptance:pooler:ubuntu-1610
+    bundle exec rake acceptance:vagrant:centos-70-x64
+    bundle exec rake acceptance:vagrant:debian-81-x64
+    bundle exec rake acceptance:vagrant:ubuntu-1404-x64
+    bundle exec rake acceptance:vagrant:ubuntu-1604-x64
 

manifests/init.pp

@@ -351,7 +351,7 @@
 # [*registry_mirror*]
 #   Sets the prefered container registry mirror.
 #   Default: undef
-#    
+#
 class docker(
   Optional[String] $version                                 = $docker::params::version,
   String $ensure                                            = $docker::params::ensure,
@@ -439,7 +439,6 @@
   String $docker_group                                      = $docker::params::docker_group,
   Array $daemon_environment_files                           = [],
   Variant[String,Hash,Undef] $repo_opt                      = $docker::params::repo_opt,
-  Boolean $nowarn_kernel                                    = $docker::params::nowarn_kernel,
   Optional[String] $os_lc                                   = $docker::params::os_lc,
   Optional[String] $storage_devs                            = $docker::params::storage_devs,
   Optional[String] $storage_vg                              = $docker::params::storage_vg,
@@ -465,8 +464,8 @@
 
 
   if $::osfamily {
-    assert_type(Pattern[/^(Debian|RedHat|Archlinux|Gentoo)$/], $::osfamily) |$a, $b| {
-      fail translate(('This module only works on Debian or Red Hat based systems or on Archlinux as on Gentoo.'))
+    assert_type(Pattern[/^(Debian|RedHat)$/], $::osfamily) |$a, $b| {
+      fail translate(('This module only works on Debian or Red Hat based systems.'))
     }
   }
 

manifests/install.pp

@@ -7,8 +7,8 @@
 class docker::install {
   $docker_start_command = $docker::docker_start_command
   if $::osfamily {
-    assert_type(Pattern[/^(Debian|RedHat|Archlinux|Gentoo)$/], $::osfamily) |$a, $b| {
-      fail translate(('This module only works on Debian or Red Hat based systems or on Archlinux as on Gentoo.'))
+    assert_type(Pattern[/^(Debian|RedHat)$/], $::osfamily) |$a, $b| {
+      fail translate(('This module only works on Debian or RedHat.'))
     }
   }
   if $docker::version and $docker::ensure != 'absent' {
@@ -33,9 +33,6 @@
         'RedHat' : {
           $pk_provider = 'rpm'
         }
-        'Gentoo' : {
-          $pk_provider = 'portage'
-        }
         default : {
           $pk_provider = undef
         }

manifests/params.pp

@@ -111,22 +111,13 @@
         }
         default: {
           $package_release = "debian-${::lsbdistcodename}"
-          if (versioncmp($::operatingsystemmajrelease, '8') >= 0) {
-            $service_provider           = 'systemd'
-            $storage_config             = '/etc/default/docker-storage'
-            $service_config_template    = 'docker/etc/sysconfig/docker.systemd.erb'
-            $service_overrides_template = 'docker/etc/systemd/system/docker.service.d/service-overrides-debian.conf.erb'
-            $service_hasstatus          = true
-            $service_hasrestart         = true
-            include docker::systemd_reload
-          } else {
-            $service_provider           = undef
-            $storage_config             = undef
-            $service_config_template    = 'docker/etc/default/docker.erb'
-            $service_overrides_template = undef
-            $service_hasstatus          = undef
-            $service_hasrestart         = undef
-          }
+          $service_provider           = 'systemd'
+          $storage_config             = '/etc/default/docker-storage'
+          $service_config_template    = 'docker/etc/sysconfig/docker.systemd.erb'
+          $service_overrides_template = 'docker/etc/systemd/system/docker.service.d/service-overrides-debian.conf.erb'
+          $service_hasstatus          = true
+          $service_hasrestart         = true
+          include docker::systemd_reload
         }
       }
 
@@ -137,7 +128,6 @@
       $pin_upstream_package_source = true
       $apt_source_pin_level = 10
       $repo_opt = undef
-      $nowarn_kernel = false
       $service_config = undef
       $storage_setup_file = undef
 
@@ -157,11 +147,10 @@
       $package_ee_package_name = $docker_ee_package_name
 
 
-      if ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemmajrelease, '8') >= 0) or
-        ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '15.04') >= 0) {
+      if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '15.04') >= 0) {
         $detach_service_in_init = false
       } else {
-        $detach_service_in_init = true
+        $detach_svervice_in_init = true
       }
 
     }
@@ -196,51 +185,18 @@
       $pin_upstream_package_source = undef
       $apt_source_pin_level = undef
       $service_name = $service_name_default
-      if (versioncmp($::operatingsystemrelease, '7.0') < 0) or ($::operatingsystem == 'Amazon') {
-        $detach_service_in_init = true
-        if $::operatingsystem == 'OracleLinux' {
-          $docker_group = 'dockerroot'
-          $socket_group = 'dockerroot'
-        } else {
-          $docker_group = $docker_group_default
-          $socket_group = $socket_group_default
-        }
-      } else {
-        $detach_service_in_init = false
-        if $use_upstream_package_source {
-          $docker_group = $docker_group_default
-          $socket_group = $socket_group_default
-        } else {
-          $docker_group = 'dockerroot'
-          $socket_group = 'dockerroot'
-        }
-        include docker::systemd_reload
-      }
+      $detach_service_in_init = false
+      $docker_group = $docker_group_default
+      $socket_group = $socket_group_default
 
       # repo_opt to specify install_options for docker package
-      if (versioncmp($::operatingsystemmajrelease, '7') == 0) {
-        if $::operatingsystem == 'RedHat' {
-          $repo_opt = '--enablerepo=rhel7-extras'
-        } elsif $::operatingsystem == 'CentOS' {
-          $repo_opt = '--enablerepo=extras'
-        } elsif $::operatingsystem == 'OracleLinux' {
-          $repo_opt = '--enablerepo=ol7_addons'
-        } elsif $::operatingsystem == 'Scientific' {
-          $repo_opt = ''
-        } else {
-          $repo_opt = undef
-        }
-      } elsif (versioncmp($::operatingsystemrelease, '7.0') < 0 and $::operatingsystem == 'OracleLinux') {
-          # FIXME is 'public_ol6_addons' available on all OL6 installs?
-          $repo_opt = '--enablerepo=public_ol6_addons,public_ol6_latest'
+      if $::operatingsystem == 'RedHat' {
+        $repo_opt = '--enablerepo=rhel7-extras'
+      } elsif $::operatingsystem == 'CentOS' {
+        $repo_opt = '--enablerepo=extras'
       } else {
         $repo_opt = undef
       }
-      if $::kernelversion == '2.6.32' {
-        $nowarn_kernel = true
-      } else {
-        $nowarn_kernel = false
-      }
     }
     default: {
       $docker_group = $docker_group_default

manifests/run.pp

@@ -217,8 +217,7 @@
       'Debian': {
         $deprecated_initscript = "/etc/init/${service_prefix}${sanitised_title}.conf"
         $hasstatus  = true
-        if ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemmajrelease, '8') >= 0) or
-          ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '15.04') >= 0) {
+        if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '15.04') >= 0) {
           $initscript = "/etc/systemd/system/${service_prefix}${sanitised_title}.service"
           $init_template = 'docker/etc/systemd/system/docker-run.erb'
           $uses_systemd = true
@@ -231,36 +230,14 @@
         }
       }
       'RedHat': {
-        if ($::operatingsystem == 'Amazon') or (versioncmp($::operatingsystemrelease, '7.0') < 0) {
-          $initscript     = "/etc/init.d/${service_prefix}${sanitised_title}"
-          $init_template  = 'docker/etc/init.d/docker-run.erb'
-          $hasstatus      = undef
-          $mode           = '0750'
-          $uses_systemd   = false
-        } else {
-          $initscript     = "/etc/systemd/system/${service_prefix}${sanitised_title}.service"
-          $init_template  = 'docker/etc/systemd/system/docker-run.erb'
-          $hasstatus      = true
-          $mode           = '0640'
-          $uses_systemd   = true
-        }
-      }
-      'Archlinux': {
         $initscript     = "/etc/systemd/system/${service_prefix}${sanitised_title}.service"
         $init_template  = 'docker/etc/systemd/system/docker-run.erb'
         $hasstatus      = true
         $mode           = '0640'
         $uses_systemd   = true
-      }
-      'Gentoo': {
-        $initscript     = "/etc/init.d/${service_prefix}${sanitised_title}"
-        $init_template  = 'docker/etc/init.d/docker-run.gentoo.erb'
-        $hasstatus      = true
-        $mode           = '0770'
-        $uses_systemd   = false
-      }
+    }
       default: {
-        fail translate(('Docker needs a Debian, RedHat, Archlinux or Gentoo based system.'))
+        fail translate(('Docker needs a Debian or RedHat based system.'))
       }
     }
 

manifests/service.pp

@@ -80,7 +80,6 @@
   $dm_metadatadev                    = $docker::dm_metadatadev,
   $tmp_dir_config                    = $docker::tmp_dir_config,
   $tmp_dir                           = $docker::tmp_dir,
-  $nowarn_kernel                     = $docker::nowarn_kernel,
   $dm_thinpooldev                    = $docker::dm_thinpooldev,
   $dm_use_deferred_removal           = $docker::dm_use_deferred_removal,
   $dm_use_deferred_deletion          = $docker::dm_use_deferred_deletion,
@@ -115,8 +114,8 @@
   $registry_mirror                   = $docker::registry_mirror,
 ) {
 
-  unless $::osfamily =~ /(Debian|RedHat|Archlinux|Gentoo)/ {
-    fail translate(('The docker::service class needs a Debian, RedHat, Archlinux or Gentoo based system.'))
+  unless $::osfamily =~ /(Debian|RedHat)/ {
+    fail translate(('The docker::service class needs a Debian or Redhat based system.'))
   }
 
   $dns_array = any2array($dns)

rakelib/acceptance.rake

@@ -14,18 +14,13 @@ end
 namespace :acceptance do
   {
     :vagrant => [
-       'centos-66-x64',
        'centos-70-x64',
-       'debian-78-x64',
        'debian-81-x64',
-       'ubuntu-12042-x64',
        'ubuntu-1404-x64',
        'ubuntu-1604-x64',
     ],
     :pooler => [
-      'centos6',
       'centos7',
-      'rhel6',
       'rhel7',
       'ubuntu-1404',
       'ubuntu-1604',

spec/acceptance/docker_spec.rb

@@ -98,8 +98,10 @@ class { 'docker':
        apply_manifest(pp, :catch_failures=>true)
      end
 
-    describe file('/etc/default/docker') do
-      it { should contain 'registry-mirror' }
+    it 'should have a registry mirror set' do
+      shell('ps -aux | grep docker') do |r|
+        expect(r.stdout).to match(/--registry-mirror=http:\/\/testmirror.io/)
+      end
     end
   end