stackforge/puppet-openstack
Code Issues Proposed changes

Merge "Allow quantum core plugin to be passed through."

Browse Source
This commit is contained in:
Jenkins
2013-07-25 12:07:38 +00:00
committed by Gerrit Code Review
parent 25510c2a07 8000de6a8d
commit 8d5cb7fb02
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/controller.pp
View File

@@ -146,6 +146,7 @@ class openstack::controller (
# optional. Not sure what to do about this. # optional. Not sure what to do about this.
$quantum_user_password = false, $quantum_user_password = false,
$quantum_db_password = false, $quantum_db_password = false,
$quantum_core_plugin = undef,
$cinder_user_password = false, $cinder_user_password = false,
$cinder_db_password = false, $cinder_db_password = false,
$swift_user_password = false, $swift_user_password = false,
@@ -450,6 +451,8 @@ class openstack::controller (
db_name => $quantum_db_name, db_name => $quantum_db_name,
db_user => $quantum_db_user, db_user => $quantum_db_user,
db_password => $quantum_db_password, db_password => $quantum_db_password,
# Plugin
core_plugin => $quantum_core_plugin,
# Quantum agents # Quantum agents
enable_dhcp_agent => $enable_dhcp_agent, enable_dhcp_agent => $enable_dhcp_agent,
enable_l3_agent => $enable_l3_agent, enable_l3_agent => $enable_l3_agent,

3
manifests/quantum.pp
View File

@@ -189,6 +189,8 @@ class openstack::quantum (
$db_name = 'quantum', $db_name = 'quantum',
$db_user = 'quantum', $db_user = 'quantum',
$sql_idle_timeout = '3600', $sql_idle_timeout = '3600',
# Plugin
$core_plugin = undef,
# General # General
$bind_address = '0.0.0.0', $bind_address = '0.0.0.0',
$keystone_host = '127.0.0.1', $keystone_host = '127.0.0.1',
@@ -198,6 +200,7 @@ class openstack::quantum (
class { '::quantum': class { '::quantum':
enabled => $enabled, enabled => $enabled,
core_plugin => $core_plugin,
bind_host => $bind_address, bind_host => $bind_address,
rabbit_host => $rabbit_host, rabbit_host => $rabbit_host,
rabbit_hosts => $rabbit_hosts, rabbit_hosts => $rabbit_hosts,