Browse Source

Update glance example

Update the glance example so that it will work.
  - fix dependency cycles in keystone mysql example
  - remove reference to ppa
tags/0.1.0
Dan Bode 7 years ago
parent
commit
8de1261f96
1 changed files with 4 additions and 16 deletions
  1. 4
    16
      examples/single.pp

+ 4
- 16
examples/single.pp View File

@@ -3,18 +3,6 @@
3 3
 # to ensure that we use the latest precise packages
4 4
 Exec { logoutput => 'on_failure' }
5 5
 
6
-if($::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
-
18 6
 node glance {
19 7
 
20 8
   class { 'role_glance_sqlite': }
@@ -27,22 +15,22 @@ node glance_keystone {
27 15
     log_verbose  => true,
28 16
     log_debug    => true,
29 17
     catalog_type => 'sql',
30
-  }->
18
+  }
31 19
   class { 'keystone::roles::admin': }
32 20
   class { 'role_glance_sqlite': }
33 21
   class { 'glance::keystone::auth': }
34 22
 }
35 23
 
36 24
 node glance_keystone_mysql {
37
-  class { 'mysql::server': }->
25
+  class { 'mysql::server': }
38 26
   class { 'keystone':
39 27
     log_verbose  => true,
40 28
     log_debug    => true,
41 29
     catalog_type => 'sql',
42
-  }->
30
+  }
43 31
   class { 'keystone::db::mysql':
44 32
     password => 'keystone',
45
-  }->
33
+  }
46 34
   class { 'keystone::roles::admin': }
47 35
   class { 'role_glance_mysql': }
48 36
   class { 'glance::keystone::auth': }

Loading…
Cancel
Save