stackforge/puppet-openstack
Code Issues Proposed changes

Add rabbit_virtual_host support to openstack controller module .. feature exists in puppetlabs-nova already. Also Made installation of Horizon optional.

Browse Source
This commit is contained in:
Aimon Bustardo
2012-11-06 17:06:02 -08:00
parent 02fc41294e
commit 0a31e07d9e
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
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

21
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.
@@ -37,6 +38,7 @@
# [cache_server_port] local memcached instance port # [cache_server_port] local memcached instance port
# [swift] (bool) is swift installed # [swift] (bool) is swift installed
# [quantum] (bool) is quantum installed # [quantum] (bool) is quantum installed
# [horizon] (bool) is horizon installed
# The next is an array of arrays, that can be used to add call-out links to the dashboard for other apps. # The next is an array of arrays, that can be used to add call-out links to the dashboard for other apps.
# There is no specific requirement for these apps to be for monitoring, that's just the defacto purpose. # There is no specific requirement for these apps to be for monitoring, that's just the defacto purpose.
# Each app is defined in two parts, the display name, and the URI # Each app is defined in two parts, the display name, and the URI
@@ -116,7 +118,9 @@ class openstack::controller (
$network_config = {}, $network_config = {},
# Rabbit # Rabbit
$rabbit_user = 'nova', $rabbit_user = 'nova',
$rabbit_virtual_host = '/',
# Horizon # Horizon
$horizon = true,
$cache_server_ip = '127.0.0.1', $cache_server_ip = '127.0.0.1',
$cache_server_port = '11211', $cache_server_port = '11211',
$horizon_app_links = undef, $horizon_app_links = undef,
@@ -267,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
@@ -295,13 +300,15 @@ class openstack::controller (
######## Horizon ######## ######## Horizon ########
class { 'openstack::horizon': if ($horizon) {
secret_key => $secret_key, class { 'openstack::horizon':
cache_server_ip => $cache_server_ip, secret_key => $secret_key,
cache_server_port => $cache_server_port, cache_server_ip => $cache_server_ip,
swift => $swift, cache_server_port => $cache_server_port,
quantum => $quantum, swift => $swift,
horizon_app_links => $horizon_app_links, quantum => $quantum,
horizon_app_links => $horizon_app_links,
}
} }
} }

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