Merge pull request #6 from jordiprats/master

suport timedatectl

.travis.yml

@@ -43,3 +43,8 @@ matrix:
     dist: trusty
     bundler_args:
     script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb
+  - rvm: default
+    env: BEAKER_set="ubuntu16-docker"
+    dist: trusty
+    bundler_args:
+    script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb

CHANGELOG.md

@@ -1,2 +1,5 @@
 # CHANGELOG
 
+## 0.1.3
+
+* timedatectl support (CentOS 7)

manifests/config.pp

@@ -1,14 +1,20 @@
-# == Class: timezone
-#
-# === timezone::config documentation
-#
 class timezone::config inherits timezone {
 
-  file { '/etc/localtime':
-    source  => "file:///usr/share/zoneinfo/${timezone::region}/${timezone::locality}",
-    links   => 'follow',
-    replace => true,
-    mode    => '0644',
+  if($timezone::params::timedatectl)
+  {
+    exec { 'set timezone - timedatectl':
+      command => "timedatectl set-timezone ${timezone::region}/${timezone::locality}",
+      unless  => "timedatectl status | grep \"Time zone: ${timezone::region}/${timezone::locality}\"",
+      path    => '/usr/sbin:/usr/bin:/sbin:/bin',
+    }
+  }
+  else
+  {
+    file { '/etc/localtime':
+      source  => "file:///usr/share/zoneinfo/${timezone::region}/${timezone::locality}",
+      links   => 'follow',
+      replace => true,
+      mode    => '0644',
+    }
   }
-
 }

manifests/init.pp

@@ -1,16 +1,12 @@
-# == Class: timezone
-#
-# === timezone documentation
-#
 class timezone(
                             $manage_package        = true,
                             $package_ensure        = 'installed',
                             $region                = 'Europe',
                             $locality              = 'Andorra',
                           ) inherits timezone::params {
 
-  class { '::timezone::install': } ->
-  class { '::timezone::config': } ->
-  Class['::timezone']
+  class { '::timezone::install': }
+  -> class { '::timezone::config': }
+  -> Class['::timezone']
 
 }

manifests/install.pp

@@ -1,7 +1,3 @@
-# == Class: timezone
-#
-# === timezone::install documentation
-#
 class timezone::install inherits timezone {
 
   if($timezone::manage_package)

manifests/params.pp

@@ -8,8 +8,13 @@
     {
       case $::operatingsystemrelease
       {
-        /^[5-7].*$/:
+        /^[5-6].*$/:
         {
+          $timedatectl=false
+        }
+        /^7.*$/:
+        {
+          $timedatectl=true
         }
         default: { fail("Unsupported RHEL/CentOS version! - ${::operatingsystemrelease}")  }
       }
@@ -22,8 +27,9 @@
         {
           case $::operatingsystemrelease
           {
-            /^14.*$/:
+            /^1[46].*$/:
             {
+              $timedatectl=false
             }
             default: { fail("Unsupported Ubuntu version! - ${::operatingsystemrelease}")  }
           }

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "eyp-timezone",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "author": "eyp",
   "summary": "sets timezone",
   "license": "Apache-2.0",
@@ -34,14 +34,10 @@
     },
     {
       "operatingsystem": "Ubuntu",
-      "operatingsystemrelease": [ "14.04" ]
+      "operatingsystemrelease": [ "14.04", "16.04" ]
     }
   ],
   "requirements": [
-    {
-      "name": "pe",
-      "version_requirement": ">= 3.0.0"
-    },
     {
       "name": "puppet",
       "version_requirement": ">= 3.0.0"

spec/acceptance/nodesets/centos5-docker.yml

@@ -5,7 +5,7 @@ HOSTS:
       strict_variables:
     platform: el-5-x86_64
     hypervisor : docker
-    image: tianon/centos:5.10
+    image: jordiprats/centos5:5.11
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:

spec/acceptance/nodesets/ubuntu16-docker.yml

@@ -0,0 +1,15 @@
+HOSTS:
+  ubuntu-1604-x64:
+    default_apply_opts:
+      order: random
+      strict_variables:
+    platform: ubuntu-16.04-amd64
+    hypervisor : docker
+    image: ubuntu:16.04
+    docker_cmd: '["/sbin/init"]'
+    docker_preserve_image: true
+    docker_image_commands:
+      - 'apt-get install net-tools gcc make tar wget -y'
+CONFIG:
+  type: foss
+  log_level: debug