diff --git a/manifests/all.pp b/manifests/all.pp index 1046e1bcb..1cb4f1636 100644 --- a/manifests/all.pp +++ b/manifests/all.pp @@ -22,8 +22,7 @@ class nova::all( $available_ips = '256', $image_service = 'nova.image.glance.GlanceImageService', - $glance_host = 'localhost', - $glance_port = '9292', + $glance_api_servers = 'localhost:9292', $admin_user = 'novaadmin', $project_name = 'nova', @@ -49,8 +48,7 @@ class nova::all( verbose => $verbose, sql_connection => "mysql://${db_user}:${db_password}@${db_host}/${db_name}", image_service => $image_service, - glance_host => $glance_host, - glance_port => $glance_port, + glance_api_servers => $glance_api_servers, rabbit_host => $rabbit_host, rabbit_port => $rabbit_port, rabbit_userid => $rabbit_userid, diff --git a/manifests/init.pp b/manifests/init.pp index fe9b5aabe..d778c73fe 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -5,8 +5,7 @@ class nova( $image_service = 'nova.image.local.LocalImageService', # these glance params should be optional # this should probably just be configured as a glance client - $glance_host = 'localhost', - $glance_port = '9292', + $glance_api_servers = 'localhost:9292', $allow_admin_api = false, $rabbit_host = 'localhost', $rabbit_password='guest', @@ -102,8 +101,7 @@ class nova( if $image_service == 'nova.image.glance.GlanceImageService' { nova_config { - 'glance_host': value => $glance_host; - 'glance_port': value => $glance_port; # default is 9292 + 'glance_api_servers': value => $glance_api_servers; } } diff --git a/manifests/rackspace/all.pp b/manifests/rackspace/all.pp index ad26ac1e7..186cc6e0e 100644 --- a/manifests/rackspace/all.pp +++ b/manifests/rackspace/all.pp @@ -14,8 +14,7 @@ class nova::rackspace::all( $flat_network_bridge = 'xenbr0', $flat_network_bridge_ip = '10.0.0.1', $flat_network_bridge_netmask = '255.255.255.0', - $glance_host = 'localhost', - $glance_port = '9292', + $glance_api_servers = 'localhost:9292', $allow_admin_api = 'true', $rabbit_host = undef, $rabbit_port = undef, @@ -69,8 +68,7 @@ class nova::rackspace::all( verbose => $verbose, sql_connection => "mysql://${db_user}:${db_password}@${db_host}/${db_name}", image_service => $image_service, - glance_host => $glance_host, - glance_port => $glance_port, + glance_api_servers => $glance_api_servers, allow_admin_api => $allow_admin_api, rabbit_host => $rabbit_host, rabbit_password => $rabbit_password, diff --git a/manifests/ubuntu/all.pp b/manifests/ubuntu/all.pp index 807fe64fb..e15669007 100644 --- a/manifests/ubuntu/all.pp +++ b/manifests/ubuntu/all.pp @@ -20,8 +20,7 @@ class nova::ubuntu::all( $available_ips = '256', $image_service = undef, - $glance_host = 'localhost', - $glance_port = '9292', + $glance_api_servers = 'localhost:9292', $admin_user = 'novaadmin', $project_name = 'nova', @@ -47,8 +46,7 @@ class nova::ubuntu::all( verbose => $verbose, sql_connection => "mysql://${db_user}:${db_password}@${db_host}/${db_name}", image_service => $image_service, - glance_host => $glance_host, - glance_port => $glance_port, + glance_api_servers => $glance_api_servers, rabbit_host => $rabbit_host, rabbit_port => $rabbit_port, rabbit_userid => $rabbit_userid, diff --git a/manifests/ubuntu/cc.pp b/manifests/ubuntu/cc.pp index 7decbe54f..307414241 100644 --- a/manifests/ubuntu/cc.pp +++ b/manifests/ubuntu/cc.pp @@ -12,8 +12,8 @@ class nova::ubuntu::cc ( $flat_network_bridge_netmask = '255.255.255.0', $image_service = 'nova.image.local.LocalImageService', - $glance_host, - $glance_port = '9292', + + $glance_api_servers = 'localhost:9292', $nova_network = '11.0.0.0', $available_ips = '256', @@ -37,12 +37,11 @@ class nova::ubuntu::cc ( } class { "nova": - logdir => $logdir, - verbose => $verbose, - sql_connection => "mysql://${db_user}:${db_password}@${db_host}/${db_name}", - image_service => $image_service, - glance_host => $glance_host, - glance_port => $glance_port, + logdir => $logdir, + verbose => $verbose, + sql_connection => "mysql://${db_user}:${db_password}@${db_host}/${db_name}", + image_service => $image_service, + glance_api_servers => $glance_api_servers, } class { "nova::api": enabled => true } diff --git a/manifests/ubuntu/compute.pp b/manifests/ubuntu/compute.pp index e22a534aa..876422903 100644 --- a/manifests/ubuntu/compute.pp +++ b/manifests/ubuntu/compute.pp @@ -6,9 +6,7 @@ class nova::ubuntu::compute ( # default to local image service. $image_service = undef, - $glance_host = undef, - $glance_port = '9292', - + $glance_api_servers = undef, $flat_network_bridge, $flat_network_bridge_ip, $flat_network_bridge_netmask, @@ -30,8 +28,7 @@ class nova::ubuntu::compute ( rabbit_userid => $rabbit_userid, rabbit_virtual_host => $rabbit_virtual_host, sql_connection => "mysql://${db_user}:${db_password}@${db_host}/${db_name}", - glance_host => $glance_host, - glance_port => $glance_port, + glance_api_servers => $glance_api_servers, } # TODO For now lets worry about FlatManager, then FlatDHCP, etc. diff --git a/tests/all.pp b/tests/all.pp index 606e7f216..ca876d4ba 100644 --- a/tests/all.pp +++ b/tests/all.pp @@ -16,8 +16,7 @@ class { 'nova::all': image_service => 'nova.image.glance.GlanceImageService', - glance_host => 'localhost', - glance_port => '9292', + glance_api_servers => 'localhost:9292', libvirt_type => 'qemu', } diff --git a/tests/rackspace/all.pp b/tests/rackspace/all.pp index 5227b0de1..b7a55f454 100644 --- a/tests/rackspace/all.pp +++ b/tests/rackspace/all.pp @@ -10,8 +10,7 @@ resources { 'nova_config': class { 'nova::rackspace::all': image_service => 'nova.image.glance.GlanceImageService', - glance_host => $ipaddress, - glance_port => '9292', + glance_api_servers => "${ipaddress}:9292", allow_admin_api => 'true', host => $hostname, xenapi_connection_url => 'https://', diff --git a/tests/ubuntu/cc.pp b/tests/ubuntu/cc.pp index 1aaf75db1..8005da58a 100644 --- a/tests/ubuntu/cc.pp +++ b/tests/ubuntu/cc.pp @@ -17,22 +17,21 @@ class { 'nova::ubuntu::cc': available_ips => '256', image_service => 'nova.image.glance.GlanceImageService', - glance_host => $ipaddress, - + glance_api_servers => "${ipaddress}:9292", db_password => 'password', - db_allowed_hosts => ['somehost', '10.0.0.2', '10.0.0.3', '10.0.0.5'], + db_allowed_hosts => ['somehost', '10.0.0.2', '10.0.0.3', '10.0.0.5', '192.168.25.11'], admin_user => 'admin', project_name => 'novaproject', } class { "glance::api": - verbose => 'true', - api_debug => 'true', + log_verbose => 'true', + log_debug => 'true', } class { "glance::registry": - verbose => 'true', - debug => 'true', + log_verbose => 'true', + log_debug => 'true', sql_connection => "mysql://nova:password@localhost/nova", } diff --git a/tests/ubuntu/compute.pp b/tests/ubuntu/compute.pp index aefa3d22a..6d015f131 100644 --- a/tests/ubuntu/compute.pp +++ b/tests/ubuntu/compute.pp @@ -12,8 +12,7 @@ class { 'nova::ubuntu::compute': db_password => 'password', image_service => 'nova.image.glance.GlanceImageService', - glance_host => '10.0.0.4', - + glance_api_servers => '10.0.0.4:9292', flat_network_bridge => 'br100', flat_network_bridge_ip => '11.0.0.2',