openstack
/
puppet-nova
Code Issues Proposed changes

removed connection type logic. 

using class names for inplementation of compute.
This commit is contained in:
Dan Bode 2011-05-31 12:38:14 -07:00
parent 9007524d21
commit ac8c7f4f79
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nova/manifests/all.pp
View File

@ -1,4 +1,6 @@
class nova::all( #
# TODO - this is currently hardcoded to be a xenserver
class nova::all (
$logdir, $logdir,
$verbose, $verbose,
$sql_connection, $sql_connection,
@ -26,7 +28,6 @@ class nova::all(
$quota_max_injected_file_content_bytes, $quota_max_injected_file_content_bytes,
$quota_max_injected_file_path_bytes, $quota_max_injected_file_path_bytes,
$host, $host,
$connection_type,
$xenapi_connection_url, $xenapi_connection_url,
$xenapi_connection_username, $xenapi_connection_username,
$xenapi_connection_password, $xenapi_connection_password,
@ -63,9 +64,8 @@ class nova::all(
} }
class { "nova::api": enabled => false } class { "nova::api": enabled => false }
class { "nova::compute": class { "nova::compute::xenserver":
host => $host, host => $host,
connection_type => $connection_type,
xenapi_connection_url => $xenapi_connection_url, xenapi_connection_url => $xenapi_connection_url,
xenapi_connection_username => $xenapi_connection_username, xenapi_connection_username => $xenapi_connection_username,
xenapi_connection_password => $xenapi_connection_password, xenapi_connection_password => $xenapi_connection_password,

1
nova/tests/all.pp
View File

@ -40,7 +40,6 @@ class { 'nova::all':
quota_max_injected_file_content_bytes => '1000000', quota_max_injected_file_content_bytes => '1000000',
quota_max_injected_file_path_bytes => '1000000', quota_max_injected_file_path_bytes => '1000000',
host => $ipaddress, host => $ipaddress,
connection_type => 'xenapi',
xenapi_connection_url => 'https://<XenServer IP>', xenapi_connection_url => 'https://<XenServer IP>',
xenapi_connection_username => 'root', xenapi_connection_username => 'root',
xenapi_connection_password => 'password', xenapi_connection_password => 'password',