openstack/puppet-nova
Code Issues Proposed changes

Changed 'name' param to 'dbname'.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/all.pp
View File

@@ -78,7 +78,7 @@ class nova::all(
class { 'nova::db': class { 'nova::db':
# pass in db config as params # pass in db config as params
password => $db_password, password => $db_password,
name => $db_name, dbname => $db_name,
user => $db_user, user => $db_user,
host => $db_host, host => $db_host,
} }

8
manifests/db.pp
View File

@@ -1,6 +1,6 @@
class nova::db( class nova::db(
$password, $password,
$name = 'nova', $dbname = 'nova',
$user = 'nova', $user = 'nova',
$host = '127.0.0.1', $host = '127.0.0.1',
$allowed_hosts = undef, $allowed_hosts = undef,
@@ -14,11 +14,11 @@ class nova::db(
# now this requires storedconfigs # now this requires storedconfigs
# TODO - worry about the security implications # TODO - worry about the security implications
@@nova_config { 'database_url': @@nova_config { 'database_url':
value => "mysql://${user}:${password}@${host}/${name}", value => "mysql://${user}:${password}@${host}/${dbname}",
tag => $zone, tag => $zone,
} }
mysql::db { $name: mysql::db { $dbname:
user => $user, user => $user,
password => $password, password => $password,
host => $host, host => $host,
@@ -32,7 +32,7 @@ class nova::db(
nova::db::host_access { $allowed_hosts: nova::db::host_access { $allowed_hosts:
user => $user, user => $user,
password => $password, password => $password,
database => $name, database => $dbname,
} }
} else { } else {
Nova::Db::Host_access<<| tag == $cluster_id |>> Nova::Db::Host_access<<| tag == $cluster_id |>>

2
manifests/rackspace/all.pp
View File

@@ -114,7 +114,7 @@ class nova::rackspace::all(
class { 'nova::db': class { 'nova::db':
# pass in db config as params # pass in db config as params
password => $db_password, password => $db_password,
name => $db_name, dbname => $db_name,
user => $db_user, user => $db_user,
host => $db_host, host => $db_host,
} }

2
manifests/ubuntu/all.pp
View File

@@ -75,7 +75,7 @@ class nova::ubuntu::all(
class { 'nova::db': class { 'nova::db':
# pass in db config as params # pass in db config as params
password => $db_password, password => $db_password,
name => $db_name, dbname => $db_name,
user => $db_user, user => $db_user,
host => $db_host, host => $db_host,
} }

2
manifests/ubuntu/cc.pp
View File

@@ -59,7 +59,7 @@ class nova::ubuntu::cc (
class { 'nova::db': class { 'nova::db':
# pass in db config as params # pass in db config as params
password => $db_password, password => $db_password,
name => $db_name, dbname => $db_name,
user => $db_user, user => $db_user,
host => $db_host, host => $db_host,
allowed_hosts => $db_allowed_hosts, allowed_hosts => $db_allowed_hosts,

2
tests/db.pp
View File

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