openstack/puppet-nova
Code Issues Proposed changes

Merge pull request #32 from gandelman-a/master

Browse Source 
Convert glance_host + glance_port config options to combined glance_api_servers
This commit is contained in:
Dan Bode
2011-06-22 19:05:55 -07:00
parent 5bca5c6837 0ed86e1331
commit 782272754d
10 changed files with 26 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/all.pp
View File

@@ -22,8 +22,7 @@ class nova::all(
$available_ips = '256', $available_ips = '256',
$image_service = 'nova.image.glance.GlanceImageService', $image_service = 'nova.image.glance.GlanceImageService',
$glance_host = 'localhost', $glance_api_servers = 'localhost:9292',
$glance_port = '9292',
$admin_user = 'novaadmin', $admin_user = 'novaadmin',
$project_name = 'nova', $project_name = 'nova',
@@ -49,8 +48,7 @@ class nova::all(
verbose => $verbose, verbose => $verbose,
sql_connection => "mysql://${db_user}:${db_password}@${db_host}/${db_name}", sql_connection => "mysql://${db_user}:${db_password}@${db_host}/${db_name}",
image_service => $image_service, image_service => $image_service,
glance_host => $glance_host, glance_api_servers => $glance_api_servers,
glance_port => $glance_port,
rabbit_host => $rabbit_host, rabbit_host => $rabbit_host,
rabbit_port => $rabbit_port, rabbit_port => $rabbit_port,
rabbit_userid => $rabbit_userid, rabbit_userid => $rabbit_userid,

6
manifests/init.pp
View File

@@ -5,8 +5,7 @@ class nova(
$image_service = 'nova.image.local.LocalImageService', $image_service = 'nova.image.local.LocalImageService',
# these glance params should be optional # these glance params should be optional
# this should probably just be configured as a glance client # this should probably just be configured as a glance client
$glance_host = 'localhost', $glance_api_servers = 'localhost:9292',
$glance_port = '9292',
$allow_admin_api = false, $allow_admin_api = false,
$rabbit_host = 'localhost', $rabbit_host = 'localhost',
$rabbit_password='guest', $rabbit_password='guest',
@@ -102,8 +101,7 @@ class nova(
if $image_service == 'nova.image.glance.GlanceImageService' { if $image_service == 'nova.image.glance.GlanceImageService' {
nova_config { nova_config {
'glance_host': value => $glance_host; 'glance_api_servers': value => $glance_api_servers;
'glance_port': value => $glance_port; # default is 9292
} }
} }

6
manifests/rackspace/all.pp
View File

@@ -14,8 +14,7 @@ class nova::rackspace::all(
$flat_network_bridge = 'xenbr0', $flat_network_bridge = 'xenbr0',
$flat_network_bridge_ip = '10.0.0.1', $flat_network_bridge_ip = '10.0.0.1',
$flat_network_bridge_netmask = '255.255.255.0', $flat_network_bridge_netmask = '255.255.255.0',
$glance_host = 'localhost', $glance_api_servers = 'localhost:9292',
$glance_port = '9292',
$allow_admin_api = 'true', $allow_admin_api = 'true',
$rabbit_host = undef, $rabbit_host = undef,
$rabbit_port = undef, $rabbit_port = undef,
@@ -69,8 +68,7 @@ class nova::rackspace::all(
verbose => $verbose, verbose => $verbose,
sql_connection => "mysql://${db_user}:${db_password}@${db_host}/${db_name}", sql_connection => "mysql://${db_user}:${db_password}@${db_host}/${db_name}",
image_service => $image_service, image_service => $image_service,
glance_host => $glance_host, glance_api_servers => $glance_api_servers,
glance_port => $glance_port,
allow_admin_api => $allow_admin_api, allow_admin_api => $allow_admin_api,
rabbit_host => $rabbit_host, rabbit_host => $rabbit_host,
rabbit_password => $rabbit_password, rabbit_password => $rabbit_password,

6
manifests/ubuntu/all.pp
View File

@@ -20,8 +20,7 @@ class nova::ubuntu::all(
$available_ips = '256', $available_ips = '256',
$image_service = undef, $image_service = undef,
$glance_host = 'localhost', $glance_api_servers = 'localhost:9292',
$glance_port = '9292',
$admin_user = 'novaadmin', $admin_user = 'novaadmin',
$project_name = 'nova', $project_name = 'nova',
@@ -47,8 +46,7 @@ class nova::ubuntu::all(
verbose => $verbose, verbose => $verbose,
sql_connection => "mysql://${db_user}:${db_password}@${db_host}/${db_name}", sql_connection => "mysql://${db_user}:${db_password}@${db_host}/${db_name}",
image_service => $image_service, image_service => $image_service,
glance_host => $glance_host, glance_api_servers => $glance_api_servers,
glance_port => $glance_port,
rabbit_host => $rabbit_host, rabbit_host => $rabbit_host,
rabbit_port => $rabbit_port, rabbit_port => $rabbit_port,
rabbit_userid => $rabbit_userid, rabbit_userid => $rabbit_userid,

15
manifests/ubuntu/cc.pp
View File

@@ -12,8 +12,8 @@ class nova::ubuntu::cc (
$flat_network_bridge_netmask = '255.255.255.0', $flat_network_bridge_netmask = '255.255.255.0',
$image_service = 'nova.image.local.LocalImageService', $image_service = 'nova.image.local.LocalImageService',
$glance_host,
$glance_port = '9292', $glance_api_servers = 'localhost:9292',
$nova_network = '11.0.0.0', $nova_network = '11.0.0.0',
$available_ips = '256', $available_ips = '256',
@@ -37,12 +37,11 @@ class nova::ubuntu::cc (
} }
class { "nova": class { "nova":
logdir => $logdir, logdir => $logdir,
verbose => $verbose, verbose => $verbose,
sql_connection => "mysql://${db_user}:${db_password}@${db_host}/${db_name}", sql_connection => "mysql://${db_user}:${db_password}@${db_host}/${db_name}",
image_service => $image_service, image_service => $image_service,
glance_host => $glance_host, glance_api_servers => $glance_api_servers,
glance_port => $glance_port,
} }
class { "nova::api": enabled => true } class { "nova::api": enabled => true }

7
manifests/ubuntu/compute.pp
View File

@@ -6,9 +6,7 @@ class nova::ubuntu::compute (
# default to local image service. # default to local image service.
$image_service = undef, $image_service = undef,
$glance_host = undef, $glance_api_servers = undef,
$glance_port = '9292',
$flat_network_bridge, $flat_network_bridge,
$flat_network_bridge_ip, $flat_network_bridge_ip,
$flat_network_bridge_netmask, $flat_network_bridge_netmask,
@@ -30,8 +28,7 @@ class nova::ubuntu::compute (
rabbit_userid => $rabbit_userid, rabbit_userid => $rabbit_userid,
rabbit_virtual_host => $rabbit_virtual_host, rabbit_virtual_host => $rabbit_virtual_host,
sql_connection => "mysql://${db_user}:${db_password}@${db_host}/${db_name}", sql_connection => "mysql://${db_user}:${db_password}@${db_host}/${db_name}",
glance_host => $glance_host, glance_api_servers => $glance_api_servers,
glance_port => $glance_port,
} }
# TODO For now lets worry about FlatManager, then FlatDHCP, etc. # TODO For now lets worry about FlatManager, then FlatDHCP, etc.

3
tests/all.pp
View File

@@ -16,8 +16,7 @@ class { 'nova::all':
image_service => 'nova.image.glance.GlanceImageService', image_service => 'nova.image.glance.GlanceImageService',
glance_host => 'localhost', glance_api_servers => 'localhost:9292',
glance_port => '9292',
libvirt_type => 'qemu', libvirt_type => 'qemu',
} }

3
tests/rackspace/all.pp
View File

@@ -10,8 +10,7 @@ resources { 'nova_config':
class { 'nova::rackspace::all': class { 'nova::rackspace::all':
image_service => 'nova.image.glance.GlanceImageService', image_service => 'nova.image.glance.GlanceImageService',
glance_host => $ipaddress, glance_api_servers => "${ipaddress}:9292",
glance_port => '9292',
allow_admin_api => 'true', allow_admin_api => 'true',
host => $hostname, host => $hostname,
xenapi_connection_url => 'https://<XenServer_IP>', xenapi_connection_url => 'https://<XenServer_IP>',

13
tests/ubuntu/cc.pp
View File

@@ -17,22 +17,21 @@ class { 'nova::ubuntu::cc':
available_ips => '256', available_ips => '256',
image_service => 'nova.image.glance.GlanceImageService', image_service => 'nova.image.glance.GlanceImageService',
glance_host => $ipaddress, glance_api_servers => "${ipaddress}:9292",
db_password => 'password', 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', admin_user => 'admin',
project_name => 'novaproject', project_name => 'novaproject',
} }
class { "glance::api": class { "glance::api":
verbose => 'true', log_verbose => 'true',
api_debug => 'true', log_debug => 'true',
} }
class { "glance::registry": class { "glance::registry":
verbose => 'true', log_verbose => 'true',
debug => 'true', log_debug => 'true',
sql_connection => "mysql://nova:password@localhost/nova", sql_connection => "mysql://nova:password@localhost/nova",
} }

3
tests/ubuntu/compute.pp
View File

@@ -12,8 +12,7 @@ class { 'nova::ubuntu::compute':
db_password => 'password', db_password => 'password',
image_service => 'nova.image.glance.GlanceImageService', 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 => 'br100',
flat_network_bridge_ip => '11.0.0.2', flat_network_bridge_ip => '11.0.0.2',