openstack
/
puppet-nova
Code Issues Proposed changes

Remove all references to glance_host,glance_port 

These parameters have been removed from the nova class.

This commit removes all of the references to these deprecated
parameters.
This commit is contained in:
Dan Bode 2012-04-08 23:04:57 +00:00
parent 118f32e12c
commit da2dc74697
3 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/site.pp
View File

@ -10,8 +10,6 @@ $rabbit_host = 'rabbitmq'
$rabbit_port = '5672'
$glance_api_servers = 'glance:9292'
$glance_host = 'glance'
$glance_port = '9292'
$api_server = 'controller'
@ -76,8 +74,6 @@ node controller {
image_service => 'nova.image.glance.GlanceImageService',
glance_api_servers => $glance_api_servers,
glance_host => $glance_host,
glance_port => $glance_port,
libvirt_type => 'qemu',
}
@ -101,8 +97,6 @@ node compute {
sql_connection => "mysql://${db_username}:${db_password}@${db_host}/${db_name}",
image_service => 'nova.image.glance.GlanceImageService',
glance_api_servers => $glance_api_servers,
glance_host => $glance_host,
glance_port => $glance_port,
rabbit_host => $rabbit_host,
rabbit_port => $rabbit_port,
rabbit_userid => $rabbit_user,
@ -192,9 +186,7 @@ node all {
rabbit_host => 'localhost',
image_service => 'nova.image.glance.GlanceImageService',
glance_host => 'localhost',
glance_port => '9292',
glance_api_servers => $glance_api_servers,
libvirt_type => 'qemu',
}

4
manifests/all.pp
View File

@ -24,8 +24,6 @@ class nova::all(
$image_service = 'nova.image.glance.GlanceImageService',
$glance_api_servers = 'localhost:9292',
$glance_host = 'localhost',
$glance_port = '9292',
$admin_user = 'novaadmin',
$project_name = 'nova',
@ -46,8 +44,6 @@ class nova::all(
sql_connection => "mysql://${db_user}:${db_password}@${db_host}/${db_name}",
image_service => $image_service,
glance_api_servers => $glance_api_servers,
glance_host => $glance_host,
glance_port => $glance_port,
rabbit_host => $rabbit_host,
rabbit_port => $rabbit_port,
rabbit_userid => $rabbit_userid,

4
manifests/controller.pp
View File

@ -26,8 +26,6 @@ class nova::controller(
$image_service = 'nova.image.glance.GlanceImageService',
$glance_api_servers = 'localhost:9292',
$glance_host = undef,
$glance_port = undef,
$admin_user = 'novaadmin',
$project_name = 'nova',
@ -43,8 +41,6 @@ class nova::controller(
sql_connection => "mysql://${db_user}:${db_password}@${db_host}/${db_name}",
image_service => $image_service,
glance_api_servers => $glance_api_servers,
glance_host => $glance_host,
glance_port => $glance_port,
rabbit_host => $rabbit_host,
rabbit_port => $rabbit_port,
rabbit_userid => $rabbit_userid,