X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fkeystone%2Ftests%2Fsite.pp;h=c3a3fbb9054e37b3962a7d85df0bf98a61b48277;hb=71a236efd9f45828d875a0a5fd025108bb1dcada;hp=ddd3355903c78d693c2875b5d5a147b3811c42b7;hpb=52e13a709b5b959cd8995e7fa4f1b226bbe13a87;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/keystone/tests/site.pp b/3rdparty/modules/keystone/tests/site.pp
index ddd335590..c3a3fbb90 100644
--- a/3rdparty/modules/keystone/tests/site.pp
+++ b/3rdparty/modules/keystone/tests/site.pp
@@ -5,36 +5,36 @@ package { 'curl': ensure => present }
 # example of how to build a single node
 # keystone instance backed by sqlite
 # with all of the default admin roles
-node keystone_sqlite {
-  class { 'keystone':
+node 'keystone_sqlite' {
+  class { '::keystone':
     verbose      => true,
     debug        => true,
     catalog_type => 'sql',
     admin_token  => 'admin_token',
   }
-  class { 'keystone::roles::admin':
+  class { '::keystone::roles::admin':
     email    => 'example@abc.com',
     password => 'ChangeMe',
   }
-  class { 'keystone::endpoint':
+  class { '::keystone::endpoint':
     public_url => "http://${::fqdn}:5000/",
     admin_url  => "http://${::fqdn}:35357/",
   }
 }
 
 node keystone_mysql {
-  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',
+  class { '::keystone':
+    verbose             => true,
+    debug               => true,
+    database_connection => 'mysql://keystone:keystone@127.0.0.1/keystone',
+    catalog_type        => 'sql',
+    admin_token         => 'admin_token',
   }
-  class { 'keystone::roles::admin':
+  class { '::keystone::roles::admin':
     email    => 'test@puppetlabs.com',
     password => 'ChangeMe',
   }
@@ -43,21 +43,21 @@ node keystone_mysql {
 
 # keystone with mysql on another node
 node keystone {
-  class { 'keystone':
-    verbose        => true,
-    debug          => true,
-    sql_connection => 'mysql://keystone:password@127.0.0.1/keystone',
-    catalog_type   => 'sql',
-    admin_token    => 'admin_token',
+  class { '::keystone':
+    verbose             => true,
+    debug               => true,
+    database_connection => 'mysql://keystone:password@127.0.0.1/keystone',
+    catalog_type        => 'sql',
+    admin_token         => 'admin_token',
   }
-  class { 'keystone::db::mysql':
+  class { '::keystone::db::mysql':
     password => 'keystone',
   }
-  class { 'keystone::roles::admin':
+  class { '::keystone::roles::admin':
     email    => 'example@abc.com',
     password => 'ChangeMe',
   }
-  class { 'keystone::endpoint':
+  class { '::keystone::endpoint':
     public_url => "http://${::fqdn}:5000/",
     admin_url  => "http://${::fqdn}:35357/",
   }