try with modules from master

[dsa-puppet.git] / 3rdparty / modules / keystone / examples / apache_dropin.pp

diff --git a/3rdparty/modules/keystone/examples/apache_dropin.pp b/3rdparty/modules/keystone/examples/apache_dropin.pp
index 310f0a3fd6d21dcdb3cce3d569fbbe7c9e175ebe..5ed29264fe9a96725ac983d4a35558f2c2867954 100644 (file)
--- a/3rdparty/modules/keystone/examples/apache_dropin.pp
+++ b/3rdparty/modules/keystone/examples/apache_dropin.pp
@@ -20,30 +20,30 @@
 
 Exec { logoutput => 'on_failure' }
 
-class { 'mysql::server': }
-class { 'keystone::db::mysql':
+class { '::mysql::server': }
+class { '::keystone::db::mysql':
   password => 'keystone',
 }
-class { 'keystone':
-  verbose        => true,
-  debug          => true,
-  sql_connection => 'mysql://keystone:keystone@127.0.0.1/keystone',
-  catalog_type   => 'sql',
-  admin_token    => 'admin_token',
-  enabled        => false,
+class { '::keystone':
+  verbose             => true,
+  debug               => true,
+  database_connection => 'mysql://keystone:keystone@127.0.0.1/keystone',
+  catalog_type        => 'sql',
+  admin_token         => 'admin_token',
+  enabled             => false,
 }
-class { 'keystone::roles::admin':
+class { '::keystone::roles::admin':
   email    => 'test@puppetlabs.com',
   password => 'ChangeMe',
 }
-class { 'keystone::endpoint':
+class { '::keystone::endpoint':
   public_url => "https://${::fqdn}:5000/",
   admin_url  => "https://${::fqdn}:35357/",
 }
 
 keystone_config { 'ssl/enable': value => true }
 
-include apache
-class { 'keystone::wsgi::apache':
+include ::apache
+class { '::keystone::wsgi::apache':
   ssl => true
 }