Commit e516aa90 authored by Adam Lewenberg's avatar Adam Lewenberg
Browse files

fix an error with crit

parent 08e70b57

manifests/init.pp

+5 −16
Original line number Diff line number Diff line
@@ -17,18 +17,10 @@ 
# https://apt.dockerproject.org/repo



class package_docker (

  $ensure          = present,

  $use_docker_repo = true,

  Enum['present', 'absent'] $ensure          = 'present',

  Boolean                   $use_docker_repo = true,

){



  case $ensure {

    'present': { }

    'absent':  { }

    default:   {

      fail "ensure must be one of 'present' or 'absent'"

    }

  }



  if ($::osfamily == 'Debian') {

    if ($use_docker_repo) {
@@ -45,7 +37,6 @@ class package_docker ( 
        }

      }





      file {'/etc/apt/sources.list.d/docker.list':

        ensure  => $ensure,

        content => template('package_docker/etc/apt/sources.list.d/docker.list.erb'),
@@ -57,9 +48,9 @@ class package_docker ( 
      $pubkey    = '58118E89F3A912897C070ADBF76221572C52609D'

      $keyid     = '2C52609D'

      if ($ensure == 'present') {

        $command = "apt-key adv --keyserver $keyserver --recv-keys $pubkey"

        $command = "apt-key adv --keyserver ${keyserver} --recv-keys ${pubkey}"

      } else {

        $command = "apt-key del $keyid"

        $command = "apt-key del ${keyid}"

      }

      exec { 'dockerproject.org apt-key':

        path        => '/usr/bin:/bin',
@@ -94,8 +85,6 @@ class package_docker ( 
      }

    }

  } else {

    crit "do not yet know how to handle ${::osfamily}"

    crit("do not yet know how to handle ${::osfamily}")

  }





}