Merge "Replace removed keystone::database_connection"

examples/apache_dropin.pp

@@ -24,11 +24,13 @@ class { 'mysql::server': }
 class { 'keystone::db::mysql':
   password => 'keystone',
 }
-class { 'keystone':
-  debug               => true,
+class { 'keystone::db':
   database_connection => 'mysql://keystone:keystone@127.0.0.1/keystone',
-  catalog_type        => 'sql',
-  enabled             => false,
+}
+class { 'keystone':
+  debug        => true,
+  catalog_type => 'sql',
+  enabled      => false,
 }
 class { 'keystone::bootstrap':
   password   => 'ChangeMe',

examples/apache_with_paths.pp

@@ -24,11 +24,14 @@ class { 'mysql::server': }
 class { 'keystone::db::mysql':
   password => 'keystone',
 }
+class { 'keystone::db':
+  database_connection => 'mysql://keystone:keystone@127.0.0.1/keystone',
+}
+
 class { 'keystone':
-  debug               => true,
-  database_connection => 'mysql://keystone_admin:keystone@127.0.0.1/keystone',
-  catalog_type        => 'sql',
-  enabled             => true,
+  debug        => true,
+  catalog_type => 'sql',
+  enabled      => true,
 }
 class { 'keystone::bootstrap':
   password   => 'ChangeMe',

examples/k2k_sp_shib.pp

@@ -41,11 +41,14 @@ class { 'keystone::db::mysql':
   password => 'keystone',
 }
 
-class { 'keystone':
-  debug               => true,
+class { 'keystone::db':
   database_connection => 'mysql://keystone:keystone@127.0.0.1/keystone',
-  catalog_type        => 'sql',
-  enabled             => false,
+}
+
+class { 'keystone':
+  debug        => true,
+  catalog_type => 'sql',
+  enabled      => false,
 }
 
 class { 'keystone::bootstrap':

examples/ldap_backend.pp

@@ -1,6 +1,9 @@
+class { 'keystone::db':
+  database_connection => 'mysql://keystone:keystone@127.0.0.1/keystone',
+}
+
 class { 'keystone':
   debug               => true,
-  database_connection => 'mysql://keystone:keystone@127.0.0.1/keystone',
   enabled             => true,
   # helper for using domains
   using_domain_config => true

examples/v3_basic.pp

@@ -5,10 +5,12 @@ class { 'mysql::server': }
 class { 'keystone::db::mysql':
   password => 'keystone',
 }
-class { 'keystone':
-  debug               => true,
+class { 'keystone::db':
   database_connection => 'mysql://keystone:keystone@127.0.0.1/keystone',
-  enabled             => true,
+}
+class { 'keystone':
+  debug   => true,
+  enabled => true,
 }
 class { 'keystone::bootstrap':
   password => 'a_big_secret',

examples/v3_domain_configuration.pp

@@ -4,9 +4,11 @@ class { 'mysql::server': }
 class { 'keystone::db::mysql':
   password => 'keystone',
 }
+class { 'keystone::db':
+  database_connection => 'mysql://keystone:keystone@127.0.0.1/keystone',
+}
 class { 'keystone':
   debug               => true,
-  database_connection => 'mysql://keystone:keystone@192.168.1.1/keystone',
   enabled             => true,
   # The domain configuration setup at keystone level
   using_domain_config => true,