correct name spacing of docker versions ('merica)

bryanhelmig · Nov 19, 2013 · 16c52f6 · 16c52f6
1 parent c07d3c2
commit 16c52f6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -27,8 +27,6 @@
   $socket_bind    = $docker::params::socket_bind,
   $network_bridge = $docker::params::network_bridge,
 ) inherits docker::params {
-
-  validate_string($version)
   validate_re($::osfamily, '^Debian$', 'This module uses the docker apt repo and only works on Debian systems that support it.')
 
   class { 'docker::install': } ->

diff --git a/manifests/install.pp b/manifests/install.pp
@@ -11,7 +11,6 @@
 #
 class docker::install {
   include apt
-  validate_string($docker::version)
   validate_re($::osfamily, '^Debian$', 'This module uses the docker apt repo and only works on Debian systems that support it.')
   validate_string($::kernelrelease)
 
@@ -34,8 +33,14 @@
     ensure => present,
   }
 
-  package { 'lxc-docker':
-    ensure  => $docker::version,
+  if $docker::version {
+    $dockerpackage = "lxc-docker-${docker::version}"
+  } else {
+    $dockerpackage = "lxc-docker"
+  }
+
+  package { $dockerpackage:
+    ensure  => present,
     require => [
         Apt::Source['docker'],
         Package[$kernelpackage],

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -1,5 +1,5 @@
 class docker::params {
-  $version        = present
+  $version        = undef
   $tcp_bind       = undef
   $network_bridge = undef
   $socket_bind    = 'unix:///var/run/docker.sock'