stackforge/puppet-openstack
Code Issues Proposed changes

Merge pull request #129 from aimonb/rabbit_virtual_host

Browse Source 
Add rabbit_virtual_host support to openstack controller
This commit is contained in:
Dan Bode
2012-11-06 23:41:04 -08:00
parent b0e290682c 426236831f
commit d48424b655
4 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/compute.pp
View File

@@ -42,6 +42,7 @@ class openstack::compute (
# Rabbit # Rabbit
$rabbit_host = '127.0.0.1', $rabbit_host = '127.0.0.1',
$rabbit_user = 'nova', $rabbit_user = 'nova',
$rabbit_virtual_host = '/',
# Glance # Glance
$glance_api_servers = false, $glance_api_servers = false,
# Virtualization # Virtualization
@@ -82,13 +83,14 @@ class openstack::compute (
} }
class { 'nova': class { 'nova':
sql_connection => $sql_connection, sql_connection => $sql_connection,
rabbit_userid => $rabbit_user, rabbit_userid => $rabbit_user,
rabbit_password => $rabbit_password, rabbit_password => $rabbit_password,
image_service => 'nova.image.glance.GlanceImageService', image_service => 'nova.image.glance.GlanceImageService',
glance_api_servers => $glance_api_servers, glance_api_servers => $glance_api_servers,
verbose => $verbose, verbose => $verbose,
rabbit_host => $rabbit_host, rabbit_host => $rabbit_host,
rabbit_virtual_host => $rabbit_virtual_host,
} }
# Install / configure nova-compute # Install / configure nova-compute

3
manifests/controller.pp
View File

@@ -18,6 +18,7 @@
# [nova_user_password] Nova service password. # [nova_user_password] Nova service password.
# [rabbit_password] Rabbit password. # [rabbit_password] Rabbit password.
# [rabbit_user] Rabbit User. # [rabbit_user] Rabbit User.
# [rabbit_virtual_host] Rabbit virtual host path for Nova. Defaults to '/'.
# [network_manager] Nova network manager to use. # [network_manager] Nova network manager to use.
# [fixed_range] Range of ipv4 network for vms. # [fixed_range] Range of ipv4 network for vms.
# [floating_range] Floating ip range to create. # [floating_range] Floating ip range to create.
@@ -117,6 +118,7 @@ class openstack::controller (
$network_config = {}, $network_config = {},
# Rabbit # Rabbit
$rabbit_user = 'nova', $rabbit_user = 'nova',
$rabbit_virtual_host = '/',
# Horizon # Horizon
$horizon = true, $horizon = true,
$cache_server_ip = '127.0.0.1', $cache_server_ip = '127.0.0.1',
@@ -269,6 +271,7 @@ class openstack::controller (
# Rabbit # Rabbit
rabbit_user => $rabbit_user, rabbit_user => $rabbit_user,
rabbit_password => $rabbit_password, rabbit_password => $rabbit_password,
rabbit_virtual_host => $rabbit_virtual_host,
# Glance # Glance
glance_api_servers => $glance_api_servers, glance_api_servers => $glance_api_servers,
# VNC # VNC

8
manifests/nova/controller.pp
View File

@@ -53,6 +53,7 @@ class openstack::nova::controller (
$nova_db_dbname = 'nova', $nova_db_dbname = 'nova',
# Rabbit # Rabbit
$rabbit_user = 'nova', $rabbit_user = 'nova',
$rabbit_virtual_host = '/',
# Database # Database
$db_type = 'mysql', $db_type = 'mysql',
# Glance # Glance
@@ -84,9 +85,10 @@ class openstack::nova::controller (
# Install / configure rabbitmq # Install / configure rabbitmq
class { 'nova::rabbitmq': class { 'nova::rabbitmq':
userid => $rabbit_user, userid => $rabbit_user,
password => $rabbit_password, password => $rabbit_password,
enabled => $enabled, enabled => $enabled,
virtual_host => $rabbit_virtual_host,
} }
# Configure Nova # Configure Nova

0
spec/fixtures/manifests/site.pp vendored
View File