From 590858a45b971d52aa3342162ae1bcde010bfb14 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Tue, 23 Apr 2013 14:49:23 -0400
Subject: [PATCH] Drop dependency on apt module.

Nova doesn't appear to have any direct dependencies on apt so we
should drop this.

Change-Id: I9b9580db655b129d41fed4ac35a999c1a1c639c7
---
 .fixtures.yml     |  1 -
 Modulefile        |  1 -
 examples/all.pp   | 17 -----------------
 examples/multi.pp | 17 -----------------
 examples/site.pp  | 20 --------------------
 5 files changed, 56 deletions(-)

diff --git a/.fixtures.yml b/.fixtures.yml
index 631b28ec1..43e02f832 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -1,6 +1,5 @@
 fixtures:
   repositories:
-    "apt": "git://github.com/puppetlabs/puppetlabs-apt.git"
     "keystone": "git://github.com/stackforge/puppet-keystone.git"
     "cinder": "git://github.com/stackforge/puppet-cinder.git"
     "mysql": "git://github.com/puppetlabs/puppetlabs-mysql.git"
diff --git a/Modulefile b/Modulefile
index cc68be6f6..c690c0645 100644
--- a/Modulefile
+++ b/Modulefile
@@ -8,7 +8,6 @@ description 'Puppet module to install and configure the OpenStack Nova compute s
 project_page 'https://github.com/puppetlabs/puppetlabs-nova'
 
 ## Add dependencies, if any:
-dependency 'puppetlabs/apt', '>= 0.0.4'
 dependency 'puppetlabs/glance', '>= 1.0.0'
 dependency 'puppetlabs/keystone', '>= 1.0.1'
 dependency 'puppetlabs/cinder', '>= 1.0.1'
diff --git a/examples/all.pp b/examples/all.pp
index 58d84dbc0..f49a879d6 100644
--- a/examples/all.pp
+++ b/examples/all.pp
@@ -24,23 +24,6 @@ resources { 'nova_config':
   purge => true,
 }
 
-#if $::osfamily == 'Debian' {
-#  # temporarily update this to use the
-#  # latest tested packages from precise
-#  # eventually, these packages need to be moved
-#  # to the openstack module
-#  stage { 'nova_ppa':
-#    before => Stage['main']
-#  }
-#
-#  class { 'apt':
-#    stage => 'nova_ppa',
-#  }
-#  class { 'keystone::repo::trunk':
-#    stage => 'nova_ppa',
-#  }
-#}
-
 # this is a hack that I have to do b/c openstack nova
 # sets up a route to reroute calls to the metadata server
 # to its own server which fails
diff --git a/examples/multi.pp b/examples/multi.pp
index 771e39aa0..cdf8524cc 100644
--- a/examples/multi.pp
+++ b/examples/multi.pp
@@ -13,23 +13,6 @@ resources { 'nova_config':
   purge => true,
 }
 
-if $::osfamily == 'Debian' {
-  # temporarily update this to use the
-  # latest tested packages from precise
-  # eventually, these packages need to be moved
-  # to the openstack module
-  stage { 'nova_ppa':
-    before => Stage['main']
-  }
-
-  class { 'apt':
-    stage => 'nova_ppa',
-  }
-  class { 'keystone::repo::trunk':
-    stage => 'nova_ppa',
-  }
-}
-
 Exec {
   logoutput => true,
 }
diff --git a/examples/site.pp b/examples/site.pp
index 42f95fed4..37d807237 100644
--- a/examples/site.pp
+++ b/examples/site.pp
@@ -17,21 +17,6 @@ resources { 'nova_config':
   purge => true,
 }
 
-# temporarily update this to use the
-# latest tested packages from precise
-# eventually, these packages need to be moved
-# to the openstack module
-stage { 'nova_ppa':
-  before => Stage['main']
-}
-
-class { 'apt':
-  stage => 'nova_ppa',
-}
-class { 'keystone::repo::trunk':
-  stage => 'nova_ppa',
-}
-
 # this is a hack that I have to do b/c openstack nova
 # sets up a route to reroute calls to the metadata server
 # to its own server which fails
@@ -112,11 +97,6 @@ node glance {
 }
 
 node rabbitmq {
-  if($::operatingsystem == 'Ubuntu') {
-    class { 'rabbitmq::repo::apt':
-      stage => 'nova_ppa',
-    }
-  }
   class { 'nova::rabbitmq':
     userid       => $rabbit_user,
     password     => $rabbit_password,