stackforge/puppet-openstack
Code Issues Proposed changes

quantum updates

Browse Source 
- do not make quantum the default config
- update params to reflect latest quantum module
This commit is contained in:
Dan Bode
2012-11-01 23:31:23 -07:00
parent bf7230912a
commit 6f76b4f979
4 changed files with 55 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/all.pp
View File

@@ -271,11 +271,10 @@ class openstack::all (
rabbit_host => '127.0.0.1', rabbit_host => '127.0.0.1',
rabbit_user => $rabbit_user, rabbit_user => $rabbit_user,
rabbit_password => $rabbit_password, rabbit_password => $rabbit_password,
sql_connection => $quantum_sql_connection,
} }
class { 'quantum::server': class { 'quantum::server':
keystone_password => $quantum_user_password, auth_password => $quantum_user_password,
} }
class { 'quantum::agents::dhcp': } class { 'quantum::agents::dhcp': }
@@ -292,6 +291,7 @@ class openstack::all (
tenant_network_type => 'gre', tenant_network_type => 'gre',
# I need to know what this does... # I need to know what this does...
local_ip => '10.0.0.1', local_ip => '10.0.0.1',
enable_tunneling => true,
} }
class { 'quantum::agents::ovs': class { 'quantum::agents::ovs':

19
manifests/compute.pp
View File

@@ -32,7 +32,7 @@ class openstack::compute (
$network_config = {}, $network_config = {},
$multi_host = false, $multi_host = false,
# Quantum # Quantum
$quantum = true, $quantum = false,
$quantum_sql_connection = false, $quantum_sql_connection = false,
$quantum_host = false, $quantum_host = false,
$quantum_user_password = false, $quantum_user_password = false,
@@ -171,14 +171,27 @@ class openstack::compute (
rabbit_host => $rabbit_host, rabbit_host => $rabbit_host,
rabbit_user => $rabbit_user, rabbit_user => $rabbit_user,
rabbit_password => $rabbit_password, rabbit_password => $rabbit_password,
sql_connection => $quantum_sql_connection, #sql_connection => $quantum_sql_connection,
}
class { 'quantum::plugins::ovs':
tenant_network_type => 'gre',
enable_tunneling => true,
} }
class { 'quantum::agents::ovs': class { 'quantum::agents::ovs':
bridge_uplinks => ["br-virtual:${private_interface}"], bridge_uplinks => ["br-virtual:${private_interface}"],
enable_tunneling => true,
local_ip => $internal_address,
} }
class { 'quantum::agents::dhcp': } class { 'quantum::agents::dhcp':
use_namespaces => False,
}
class { 'quantum::agents::l3':
auth_password => $quantum_user_password,
}
class { 'nova::compute::quantum': } class { 'nova::compute::quantum': }

7
manifests/controller.pp
View File

@@ -131,7 +131,7 @@ class openstack::controller (
$cinder_db_user = 'cinder', $cinder_db_user = 'cinder',
$cinder_db_dbname = 'cinder', $cinder_db_dbname = 'cinder',
# quantum # quantum
$quantum = true, $quantum = false,
$quantum_db_user = 'quantum', $quantum_db_user = 'quantum',
$quantum_db_dbname = 'quantum', $quantum_db_dbname = 'quantum',
$enabled = true $enabled = true
@@ -253,7 +253,12 @@ class openstack::controller (
multi_host => $multi_host, multi_host => $multi_host,
public_interface => $public_interface, public_interface => $public_interface,
private_interface => $private_interface, private_interface => $private_interface,
# Quantum
quantum => $quantum, quantum => $quantum,
quantum_user_password => $quantum_user_password,
quantum_db_password => $quantum_db_password,
quantum_db_user => $quantum_db_user,
quantum_db_dbname => $quantum_db_dbname,
# Nova # Nova
nova_user_password => $nova_user_password, nova_user_password => $nova_user_password,
nova_db_password => $nova_db_password, nova_db_password => $nova_db_password,

35
manifests/nova/controller.pp
View File

@@ -42,7 +42,12 @@ class openstack::nova::controller (
$multi_host = false, $multi_host = false,
$public_interface = undef, $public_interface = undef,
$private_interface = undef, $private_interface = undef,
$quantum = true, # quantum
$quantum = false,
$quantum_db_dbname = 'quantum',
$quantum_db_user = 'quantum',
$quantum_db_password = 'quantum_pass',
$quantum_user_password = 'quantum_pass',
# Nova # Nova
$nova_db_user = 'nova', $nova_db_user = 'nova',
$nova_db_dbname = 'nova', $nova_db_dbname = 'nova',
@@ -140,21 +145,41 @@ class openstack::nova::controller (
class { 'quantum': class { 'quantum':
rabbit_user => $rabbit_user, rabbit_user => $rabbit_user,
rabbit_password => $rabbit_password, rabbit_password => $rabbit_password,
sql_connection => $quantum_sql_connection, #sql_connection => $quantum_sql_connection,
verbose => $verbose, verbose => $verbose,
debug => $verbose,
} }
class { 'quantum::server': class { 'quantum::server':
keystone_password => $quantum_user_password, auth_password => $quantum_user_password,
} }
class { 'quantum::plugins::ovs': class { 'quantum::plugins::ovs':
sql_connection => $quantum_sql_connection, sql_connection => $quantum_sql_connection,
tenant_network_type => 'gre', tenant_network_type => 'gre',
# I need to know what this does... enable_tunneling => true,
local_ip => '10.0.0.1',
} }
class { 'quantum::agents::ovs':
bridge_uplinks => ["br-virtual:${private_interface}"],
enable_tunneling => true,
local_ip => $internal_address,
}
class { 'quantum::agents::dhcp':
use_namespaces => False,
}
# class { 'quantum::agents::dhcp':
# use_namespaces => False,
# }
#
#
# class { 'quantum::agents::l3':
# auth_password => $quantum_user_password,
# }
class { 'nova::network::quantum': class { 'nova::network::quantum':
#$fixed_range, #$fixed_range,
quantum_admin_password => $quantum_user_password, quantum_admin_password => $quantum_user_password,