summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Bode <dan@puppetlabs.com>2012-10-31 16:02:34 -0700
committerDan Bode <dan@puppetlabs.com>2012-10-31 16:02:34 -0700
commit879dfa3a8eff2868e8cb1b92fa32037518c7a6a5 (patch)
tree8a905fa6b447a5759544d1c518020d917a76b9c0
parent5892728c2e6eac4bac54538d81f1d0e09f33ff20 (diff)
switch single.pp to site.pp
in example directory
-rw-r--r--examples/site.pp (renamed from examples/single.pp)52
1 files changed, 7 insertions, 45 deletions
diff --git a/examples/single.pp b/examples/site.pp
index 5eecfe9..1f2fda9 100644
--- a/examples/single.pp
+++ b/examples/site.pp
@@ -3,39 +3,24 @@
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
6node glance {
7
8 class { 'role_glance_sqlite': }
9
10}
11
12node glance_keystone {
13 class { 'keystone::config::sqlite': }
14 class { 'keystone':
15 verbose => true,
16 debug => true,
17 catalog_type => 'sql',
18 }
19 class { 'keystone::roles::admin': }
20 class { 'role_glance_sqlite': }
21 class { 'glance::keystone::auth': }
22}
23
24node glance_keystone_mysql { 6node glance_keystone_mysql {
25 class { 'mysql::server': } 7 class { 'mysql::server': }
26 class { 'keystone': 8 class { 'keystone':
27 verbose => true, 9 verbose => true,
28 debug => true, 10 debug => true,
29 catalog_type => 'sql', 11 catalog_type => 'sql',
12 admin_token => 'admin_token',
30 } 13 }
31 class { 'keystone::db::mysql': 14 class { 'keystone::db::mysql':
32 password => 'keystone', 15 password => 'keystone',
33 } 16 }
34 class { 'keystone::roles::admin': } 17 class { 'keystone::roles::admin':
18 email => 'test@puppetlabs.com',
19 password => 'ChangeMe',
20 }
35 class { 'role_glance_mysql': } 21 class { 'role_glance_mysql': }
36 class { 'glance::keystone::auth': } 22 class { 'glance::keystone::auth':
37 class { 'keystone::config::mysql': 23 password => 'glance_pass',
38 password => 'keystone'
39 } 24 }
40} 25}
41 26
@@ -43,29 +28,6 @@ node default {
43 fail("could not find a matching node entry for ${clientcert}") 28 fail("could not find a matching node entry for ${clientcert}")
44} 29}
45 30
46class role_glance_sqlite {
47
48 class { 'glance::api':
49 verbose => 'True',
50 debug => 'True',
51 auth_type => 'keystone',
52 keystone_tenant => 'services',
53 keystone_user => 'glance',
54 keystone_password => 'glance_password',
55 }
56 class { 'glance::backend::file': }
57
58 class { 'glance::registry':
59 verbose => 'True',
60 debug => 'True',
61 auth_type => 'keystone',
62 keystone_tenant => 'services',
63 keystone_user => 'glance',
64 keystone_password => 'glance_password',
65 }
66
67}
68
69class role_glance_mysql { 31class role_glance_mysql {
70 32
71 class { 'glance::api': 33 class { 'glance::api':