Merge pull request #424 from mhaskel/hulk_smash

Hulk smash
puppetlabs · Feb 19, 2015 · 463a61c · 463a61c
2 parents da4a1dc + 59782da
commit 463a61c
Show file tree

Hide file tree

Showing 58 changed files with 41 additions and 1,380 deletions.
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -2,6 +2,6 @@ fixtures:
   repositories:
     "stdlib":
       "repo": "git://github.com/puppetlabs/puppetlabs-stdlib.git"
-      "ref": "v2.2.1"
+      "ref": "4.5.0"
   symlinks:
     "apt": "#{source_dir}"
diff --git a/examples/backports.pp b/examples/backports.pp
@@ -0,0 +1 @@
+# TODO
diff --git a/examples/builddep.pp b/examples/builddep.pp
@@ -0,0 +1,3 @@
+package{ 'glusterfs-server':
+  install_options => 'build-dep',
+}
diff --git a/examples/force.pp b/examples/force.pp
@@ -0,0 +1,2 @@
+# force.pp
+# TODO: Update
diff --git a/examples/hold.pp b/examples/hold.pp
@@ -0,0 +1,5 @@
+apt::pin { 'hold-vim':
+  packages => 'vim',
+  version  => '2:7.4.488-5',
+  priority => 1001,
+}
diff --git a/tests/key.pp → examples/key.pp b/tests/key.pp → examples/key.pp
diff --git a/tests/pin.pp → examples/pin.pp b/tests/pin.pp → examples/pin.pp
diff --git a/tests/ppa.pp → examples/ppa.pp b/tests/ppa.pp → examples/ppa.pp
diff --git a/examples/release.pp b/examples/release.pp
@@ -0,0 +1,4 @@
+apt::conf { 'release':
+  content  => 'APT::Default-Release "karmic";',
+  priority => '01',
+}
diff --git a/tests/source.pp → examples/source.pp b/tests/source.pp → examples/source.pp
diff --git a/examples/unattended_upgrades.pp b/examples/unattended_upgrades.pp
@@ -0,0 +1 @@
+# TODO
diff --git a/manifests/backports.pp b/manifests/backports.pp
diff --git a/manifests/builddep.pp b/manifests/builddep.pp
diff --git a/manifests/conf.pp b/manifests/conf.pp
@@ -4,8 +4,6 @@
   $priority = '50'
 ) {
 
-  include apt::params
-
   $apt_conf_d = $apt::params::apt_conf_d
 
   file { "${apt_conf_d}/${priority}${name}":

diff --git a/manifests/debian/testing.pp b/manifests/debian/testing.pp
diff --git a/manifests/debian/unstable.pp b/manifests/debian/unstable.pp
diff --git a/manifests/force.pp b/manifests/force.pp
diff --git a/manifests/hold.pp b/manifests/hold.pp