From 8de1261f96a05741a5b89bfeff10975fbc844f12 Mon Sep 17 00:00:00 2001
From: Dan Bode <dan@puppetlabs.com>
Date: Mon, 23 Apr 2012 00:26:11 -0700
Subject: [PATCH] Update glance example

Update the glance example so that it will work.
  - fix dependency cycles in keystone mysql example
  - remove reference to ppa
---
 examples/single.pp | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/examples/single.pp b/examples/single.pp
index 62c8d11f..9ea2fe00 100644
--- a/examples/single.pp
+++ b/examples/single.pp
@@ -3,18 +3,6 @@
 # to ensure that we use the latest precise packages
 Exec { logoutput => 'on_failure' }
 
-if($::osfamily == 'Debian') {
-  stage { 'glance_ppa':
-    before => Stage['main'],
-  }
-  class { 'apt':
-    stage => 'glance_ppa',
-  }
-  class { 'keystone::repo::trunk':
-    stage => 'glance_ppa',
-  }
-}
-
 node glance {
 
   class { 'role_glance_sqlite': }
@@ -27,22 +15,22 @@ node glance_keystone {
     log_verbose  => true,
     log_debug    => true,
     catalog_type => 'sql',
-  }->
+  }
   class { 'keystone::roles::admin': }
   class { 'role_glance_sqlite': }
   class { 'glance::keystone::auth': }
 }
 
 node glance_keystone_mysql {
-  class { 'mysql::server': }->
+  class { 'mysql::server': }
   class { 'keystone':
     log_verbose  => true,
     log_debug    => true,
     catalog_type => 'sql',
-  }->
+  }
   class { 'keystone::db::mysql':
     password => 'keystone',
-  }->
+  }
   class { 'keystone::roles::admin': }
   class { 'role_glance_mysql': }
   class { 'glance::keystone::auth': }