From 50b2877ea31c6c1c41dff2ec389cb80edec18ec9 Mon Sep 17 00:00:00 2001
From: Dan Bode <dan@puppetlabs.com>
Date: Wed, 22 Jun 2011 16:53:29 -0700
Subject: [PATCH] Changed 'name' param to 'dbname'.

Name should never be set as a class param.

It is a reserved param.
---
 manifests/all.pp           | 2 +-
 manifests/db.pp            | 8 ++++----
 manifests/rackspace/all.pp | 2 +-
 manifests/ubuntu/all.pp    | 2 +-
 manifests/ubuntu/cc.pp     | 2 +-
 tests/db.pp                | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/manifests/all.pp b/manifests/all.pp
index 1046e1bcb..5f70813ce 100644
--- a/manifests/all.pp
+++ b/manifests/all.pp
@@ -78,7 +78,7 @@ class nova::all(
   class { 'nova::db':
     # pass in db config as params
     password => $db_password,
-    name     => $db_name,
+    dbname   => $db_name,
     user     => $db_user,
     host     => $db_host,
   }
diff --git a/manifests/db.pp b/manifests/db.pp
index 29bf4174e..c5393afa9 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -1,6 +1,6 @@
 class nova::db(
   $password,
-  $name = 'nova',
+  $dbname = 'nova',
   $user = 'nova',
   $host = '127.0.0.1',
   $allowed_hosts = undef,
@@ -14,11 +14,11 @@ class nova::db(
   # now this requires storedconfigs
   # TODO - worry about the security implications
   @@nova_config { 'database_url':
-    value => "mysql://${user}:${password}@${host}/${name}",
+    value => "mysql://${user}:${password}@${host}/${dbname}",
     tag   => $zone,
   }
 
-  mysql::db { $name:
+  mysql::db { $dbname:
     user         => $user,
     password     => $password,
     host         => $host,
@@ -32,7 +32,7 @@ class nova::db(
      nova::db::host_access { $allowed_hosts:
       user      => $user,
       password  => $password,
-      database  => $name,
+      database  => $dbname,
     }
   } else {
     Nova::Db::Host_access<<| tag == $cluster_id |>>
diff --git a/manifests/rackspace/all.pp b/manifests/rackspace/all.pp
index ad26ac1e7..8245b2efe 100644
--- a/manifests/rackspace/all.pp
+++ b/manifests/rackspace/all.pp
@@ -114,7 +114,7 @@ class nova::rackspace::all(
   class { 'nova::db':
     # pass in db config as params
     password => $db_password,
-    name     => $db_name,
+    dbname   => $db_name,
     user     => $db_user,
     host     => $db_host,
   }
diff --git a/manifests/ubuntu/all.pp b/manifests/ubuntu/all.pp
index 807fe64fb..65839b0b5 100644
--- a/manifests/ubuntu/all.pp
+++ b/manifests/ubuntu/all.pp
@@ -75,7 +75,7 @@ class nova::ubuntu::all(
   class { 'nova::db':
     # pass in db config as params
     password => $db_password,
-    name     => $db_name,
+    dbname   => $db_name,
     user     => $db_user,
     host     => $db_host,
   }
diff --git a/manifests/ubuntu/cc.pp b/manifests/ubuntu/cc.pp
index 7decbe54f..e29c9cfdf 100644
--- a/manifests/ubuntu/cc.pp
+++ b/manifests/ubuntu/cc.pp
@@ -59,7 +59,7 @@ class nova::ubuntu::cc (
   class { 'nova::db':
     # pass in db config as params
     password      => $db_password,
-    name          => $db_name,
+    dbname        => $db_name,
     user          => $db_user,
     host          => $db_host,
     allowed_hosts => $db_allowed_hosts,
diff --git a/tests/db.pp b/tests/db.pp
index c1962d2a3..114759126 100644
--- a/tests/db.pp
+++ b/tests/db.pp
@@ -6,7 +6,7 @@ class { 'mysql::server':
 }
 class { 'nova::db':
   password => 'password',
-  name     => 'nova',
+  dbname   => 'nova',
   user     => 'nova',
   host     => 'localhost',
 }