Commit 7d7703de authored by Adam Lewenberg's avatar Adam Lewenberg
Browse files

make sure apt-transport-https package is installed if using dockerproject.org

parent af1df47c
Loading
Loading
Loading
Loading
+10 −10
Original line number Diff line number Diff line
@@ -21,15 +21,9 @@ class package_docker (
  $use_docker_repo = true,
){

$complement_ensure

  case $ensure {
    'present': {
      $complement_ensure = 'absent'
    }
    'present', 'absent': {
      $complement_ensure = 'present'
    }
    'present': { }
    'absent':  { }
    default:   {
      fail "ensure must be one of 'present' or 'absent'"
    }
@@ -38,13 +32,19 @@ $complement_ensure
  if ($::osfamily == 'Debian') {
    if ($use_docker_repo) {

      # If installing, make sure we get rid of docker.io.
      # If installing, make sure we get rid of docker.io and that we have
      # the apt-transport-https package.
      if ($ensure == 'present') {
        package { 'docker.io':
          ensure => absent,
          before => Package['docker-engine'],
        }
        package { 'apt-transport-https':
          ensure => present,
          before => File['/etc/apt/sources.list.d/docker.list'],
        }
      }


      file {'/etc/apt/sources.list.d/docker.list':
        ensure  => $ensure,

metadata.json

0 → 100644
+10 −0
Original line number Diff line number Diff line
{
    "name":      "puppetpublic-package_docker",
    "version":   "1",
    "author":    "ACS staff <adamhl@stanford.edu>",
    "summary":   "Install docker engine package",
    "source":    "https://code.stanford.edu/puppetpublic/package_docker.git",
    "issues_url":       null,
    "license":   "MIT",
    "dependencies": []
}