summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Bode <dan@puppetlabs.com>2012-04-23 00:26:11 -0700
committerDan Bode <dan@puppetlabs.com>2012-04-23 00:26:11 -0700
commit8de1261f96a05741a5b89bfeff10975fbc844f12 (patch)
tree3a6f692fc1a24385e518f3a58558cef3eded4539
parent52aae65a4ca8a6ca9c717c99bac9c2a7dcc147d5 (diff)
Update glance example
Update the glance example so that it will work. - fix dependency cycles in keystone mysql example - remove reference to ppa
-rw-r--r--examples/single.pp20
1 files changed, 4 insertions, 16 deletions
diff --git a/examples/single.pp b/examples/single.pp
index 62c8d11..9ea2fe0 100644
--- a/examples/single.pp
+++ b/examples/single.pp
@@ -3,18 +3,6 @@
3# to ensure that we use the latest precise packages 3# to ensure that we use the latest precise packages
4Exec { logoutput => 'on_failure' } 4Exec { logoutput => 'on_failure' }
5 5
6if($::osfamily == 'Debian') {
7 stage { 'glance_ppa':
8 before => Stage['main'],
9 }
10 class { 'apt':
11 stage => 'glance_ppa',
12 }
13 class { 'keystone::repo::trunk':
14 stage => 'glance_ppa',
15 }
16}
17
18node glance { 6node glance {
19 7
20 class { 'role_glance_sqlite': } 8 class { 'role_glance_sqlite': }
@@ -27,22 +15,22 @@ node glance_keystone {
27 log_verbose => true, 15 log_verbose => true,
28 log_debug => true, 16 log_debug => true,
29 catalog_type => 'sql', 17 catalog_type => 'sql',
30 }-> 18 }
31 class { 'keystone::roles::admin': } 19 class { 'keystone::roles::admin': }
32 class { 'role_glance_sqlite': } 20 class { 'role_glance_sqlite': }
33 class { 'glance::keystone::auth': } 21 class { 'glance::keystone::auth': }
34} 22}
35 23
36node glance_keystone_mysql { 24node glance_keystone_mysql {
37 class { 'mysql::server': }-> 25 class { 'mysql::server': }
38 class { 'keystone': 26 class { 'keystone':
39 log_verbose => true, 27 log_verbose => true,
40 log_debug => true, 28 log_debug => true,
41 catalog_type => 'sql', 29 catalog_type => 'sql',
42 }-> 30 }
43 class { 'keystone::db::mysql': 31 class { 'keystone::db::mysql':
44 password => 'keystone', 32 password => 'keystone',
45 }-> 33 }
46 class { 'keystone::roles::admin': } 34 class { 'keystone::roles::admin': }
47 class { 'role_glance_mysql': } 35 class { 'role_glance_mysql': }
48 class { 'glance::keystone::auth': } 36 class { 'glance::keystone::auth': }