diff --git a/examples/single.pp b/examples/site.pp similarity index 55% rename from examples/single.pp rename to examples/site.pp index 5eecfe93..1f2fda9f 100644 --- a/examples/single.pp +++ b/examples/site.pp @@ -3,39 +3,24 @@ # to ensure that we use the latest precise packages Exec { logoutput => 'on_failure' } -node glance { - - class { 'role_glance_sqlite': } - -} - -node glance_keystone { - class { 'keystone::config::sqlite': } - class { 'keystone': - verbose => true, - 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 { 'keystone': verbose => true, debug => true, catalog_type => 'sql', + admin_token => 'admin_token', } class { 'keystone::db::mysql': password => 'keystone', } - class { 'keystone::roles::admin': } + class { 'keystone::roles::admin': + email => 'test@puppetlabs.com', + password => 'ChangeMe', + } class { 'role_glance_mysql': } - class { 'glance::keystone::auth': } - class { 'keystone::config::mysql': - password => 'keystone' + class { 'glance::keystone::auth': + password => 'glance_pass', } } @@ -43,29 +28,6 @@ node default { fail("could not find a matching node entry for ${clientcert}") } -class role_glance_sqlite { - - class { 'glance::api': - verbose => 'True', - debug => 'True', - auth_type => 'keystone', - keystone_tenant => 'services', - keystone_user => 'glance', - keystone_password => 'glance_password', - } - class { 'glance::backend::file': } - - class { 'glance::registry': - verbose => 'True', - debug => 'True', - auth_type => 'keystone', - keystone_tenant => 'services', - keystone_user => 'glance', - keystone_password => 'glance_password', - } - -} - class role_glance_mysql { class { 'glance::api':