Changed 'name' param to 'dbname'.

Name should never be set as a class param.

It is a reserved param.
This commit is contained in:
Dan Bode 2011-06-22 16:53:29 -07:00
parent ccce22d87a
commit 50b2877ea3
6 changed files with 9 additions and 9 deletions

View File

@ -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,
}

View File

@ -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 |>>

View File

@ -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,
}

View File

@ -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,
}

View File

@ -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,

View File

@ -6,7 +6,7 @@ class { 'mysql::server':
}
class { 'nova::db':
password => 'password',
name => 'nova',
dbname => 'nova',
user => 'nova',
host => 'localhost',
}