Merge pull request #25 from bodepd/issue/master/rabbit_user_and_libvirt_config

Issue/master/rabbit user and libvirt config
This commit is contained in:
Dan Bode 2011-06-18 17:34:30 -07:00
commit 51a0250f03
5 changed files with 24 additions and 8 deletions

2
README
View File

@ -2,3 +2,5 @@ h1. Prerequisites
The openstack repo should be made available:
see: http://docs.openstack.org/cactus/openstack-compute/admin/content/installing-the-cloud-controller.html
This is currently known not to work on 2.6.4.

View File

@ -12,6 +12,8 @@ class nova::all(
$rabbit_virtual_host = undef,
$rabbit_host = undef,
$libvirt_type = 'qemu',
$flat_network_bridge = 'br100',
$flat_network_bridge_ip = '11.0.0.1',
$flat_network_bridge_netmask = '255.255.255.0',
@ -59,8 +61,9 @@ class nova::all(
class { "nova::api": enabled => true }
class { "nova::compute":
api_server => $ipaddress,
enabled => true,
api_server => $ipaddress,
libvirt_type => $libvirt_type,
enabled => true,
}
class { "nova::network::flat":

View File

@ -4,11 +4,14 @@ class nova::compute(
$api_server,
$enabled = false,
$api_port = 8773,
$aws_address = '169.254.169.254'
$aws_address = '169.254.169.254',
$libvirt_type = 'kvm'
) {
Nova_config<| |>~>Service['nova-compute']
nova_config { 'libvirt_type': value => $libvirt_type }
if $enabled {
$service_ensure = 'running'
} else {

View File

@ -26,6 +26,13 @@ class nova::rabbitmq(
provider => 'rabbitmqctl',
require => Class['rabbitmq::server'],
}
# I need to figure out the appropriate permissions
rabbitmq_user_permissions { "${userid}@${virtual_host}":
configure_permission => '.*',
write_permission => '.*',
read_permission => '.*',
provider => 'rabbitmqctl',
}
}
class { 'rabbitmq::server':
port => $port,

View File

@ -20,15 +20,16 @@ class { 'nova::all':
db_user => 'nova',
db_host => 'localhost',
#$rabbit_password => 'rabbitpassword',
#rabbit_port => '5672',
#rabbit_userid => 'rabbit_user',
#rabbit_virtual_host => '/',
#rabbit_host => 'localhost',
rabbit_password => 'rabbitpassword',
rabbit_port => '5672',
rabbit_userid => 'rabbit_user',
rabbit_virtual_host => '/',
rabbit_host => 'localhost',
image_service => 'nova.image.glance.GlanceImageService',
glance_host => 'localhost',
glance_port => '9292',
libvirt_type => 'qemu',
}