X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=blobdiff_plain;f=3rdparty%2Fmodules%2Fkeystone%2Fexamples%2Fapache_with_paths.pp;fp=3rdparty%2Fmodules%2Fkeystone%2Fexamples%2Fapache_with_paths.pp;h=8b0fc699c0cea900b3da641dd51377f5bd1e3b97;hp=be28d395bc8bedbf9d7292abf4279b09d1b36cc6;hb=71a236efd9f45828d875a0a5fd025108bb1dcada;hpb=52e13a709b5b959cd8995e7fa4f1b226bbe13a87

diff --git a/3rdparty/modules/keystone/examples/apache_with_paths.pp b/3rdparty/modules/keystone/examples/apache_with_paths.pp
index be28d395..8b0fc699 100644
--- a/3rdparty/modules/keystone/examples/apache_with_paths.pp
+++ b/3rdparty/modules/keystone/examples/apache_with_paths.pp
@@ -20,32 +20,32 @@
 
 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_admin:keystone@127.0.0.1/keystone',
-  catalog_type   => 'sql',
-  admin_token    => 'admin_token',
-  enabled        => true,
+class { '::keystone':
+  verbose             => true,
+  debug               => true,
+  database_connection => 'mysql://keystone_admin:keystone@127.0.0.1/keystone',
+  catalog_type        => 'sql',
+  admin_token         => 'admin_token',
+  enabled             => true,
 }
-class { 'keystone::cron::token_flush': }
-class { 'keystone::roles::admin':
+class { '::keystone::cron::token_flush': }
+class { '::keystone::roles::admin':
   email    => 'test@puppetlabs.com',
   password => 'ChangeMe',
 }
-class { 'keystone::endpoint':
-  public_url    => "https://${::fqdn}:443/main/",
-  admin_address => "https://${::fqdn}:443/admin/",
+class { '::keystone::endpoint':
+  public_url => "https://${::fqdn}:443/main/",
+  admin_url  => "https://${::fqdn}:443/admin/",
 }
 
 keystone_config { 'ssl/enable': ensure  => absent }
 
-include apache
-class { 'keystone::wsgi::apache':
+include ::apache
+class { '::keystone::wsgi::apache':
   ssl         => true,
   public_port => 443,
   admin_port  => 443,