Update glance example

Update the glance example so that it will work.
  - fix dependency cycles in keystone mysql example
  - remove reference to ppa
This commit is contained in:
Dan Bode 2012-04-23 00:26:11 -07:00
parent 52aae65a4c
commit 8de1261f96
1 changed files with 4 additions and 16 deletions

View File

@ -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': }