stackforge/puppet-openstack
Code Issues Proposed changes

replaced nova::nework with quantum.

Browse Source
This commit is contained in:
Dan Bode
2012-10-12 20:49:12 -07:00
parent cca646e76d
commit c612934570
5 changed files with 123 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
manifests/compute.pp
View File

@@ -25,11 +25,7 @@ class openstack::compute (
# Network
$public_address = undef,
$public_interface = undef,
$private_interface = 'eth1',
$fixed_range = '10.0.0.0/24',
$network_manager = 'nova.network.manager.FlatDHCPManager',
$network_config = {},
$multi_host = false,
# DB
$sql_connection = false,
# Nova
@@ -93,14 +89,14 @@ class openstack::compute (
# compute installation
if $multi_host {
include keystone::python
nova_config {
'multi_host': value => 'True';
'send_arp_for_ha': value => 'True';
}
if ! $public_interface {
fail('public_interface must be defined for multi host compute nodes')
}
$enable_network_service = true
#nova_config {
# 'multi_host': value => 'True';
# 'send_arp_for_ha': value => 'True';
#}
#if ! $public_interface {
# fail('public_interface must be defined for multi host compute nodes')
#}
#$enable_network_service = true
class { 'nova::api':
enabled => true,
admin_tenant_name => 'services',
@@ -109,23 +105,23 @@ class openstack::compute (
# TODO override enabled_apis
}
} else {
$enable_network_service = false
nova_config {
'multi_host': value => 'False';
'send_arp_for_ha': value => 'False';
}
#$enable_network_service = false
#nova_config {
# 'multi_host': value => 'False';
# 'send_arp_for_ha': value => 'False';
#}
}
class { 'nova::network':
private_interface => $private_interface,
public_interface => $public_interface,
fixed_range => $fixed_range,
floating_range => false,
network_manager => $network_manager,
config_overrides => $network_config,
create_networks => false,
enabled => $enable_network_service,
install_service => $enable_network_service,
}
#class { 'nova::network':
# private_interface => $private_interface,
# public_interface => $public_interface,
# fixed_range => $fixed_range,
# floating_range => false,
# network_manager => $network_manager,
# config_overrides => $network_config,
# create_networks => false,
# enabled => $enable_network_service,
# install_service => $enable_network_service,
#}
}

48
manifests/controller.pp
View File

@@ -128,6 +128,11 @@ class openstack::controller (
$cinder_db_password = 'cinder_db_pass',
$cinder_db_user = 'cinder',
$cinder_db_dbname = 'cinder',
#
$quantum_user_password = 'quantum_user_pass',
$quantum_db_password = 'quantum_db_pass',
$quantum_db_user = 'quantum',
$quantum_db_dbname = 'quantum',
$enabled = true
) {
@@ -158,6 +163,9 @@ class openstack::controller (
cinder_db_user => $cinder_db_user,
cinder_db_password => $cinder_db_password,
cinder_db_dbname => $cinder_db_dbname,
quantum_db_user => $quantum_db_user,
quantum_db_password => $quantum_db_password,
quantum_db_dbname => $quantum_db_dbname,
allowed_hosts => $allowed_hosts,
enabled => $enabled,
}
@@ -165,23 +173,24 @@ class openstack::controller (
####### KEYSTONE ###########
class { 'openstack::keystone':
verbose => $verbose,
db_type => $db_type,
db_host => $db_host,
db_password => $keystone_db_password,
db_name => $keystone_db_dbname,
db_user => $keystone_db_user,
admin_token => $keystone_admin_token,
admin_tenant => $keystone_admin_tenant,
admin_email => $admin_email,
admin_password => $admin_password,
public_address => $public_address,
internal_address => $internal_address,
admin_address => $admin_address,
glance_user_password => $glance_user_password,
nova_user_password => $nova_user_password,
cinder_user_password => $cinder_user_password,
enabled => $enabled,
verbose => $verbose,
db_type => $db_type,
db_host => $db_host,
db_password => $keystone_db_password,
db_name => $keystone_db_dbname,
db_user => $keystone_db_user,
admin_token => $keystone_admin_token,
admin_tenant => $keystone_admin_tenant,
admin_email => $admin_email,
admin_password => $admin_password,
public_address => $public_address,
internal_address => $internal_address,
admin_address => $admin_address,
glance_user_password => $glance_user_password,
nova_user_password => $nova_user_password,
cinder_user_password => $cinder_user_password,
quantum_user_password => $quantum_user_password,
enabled => $enabled,
}
@@ -212,10 +221,7 @@ class openstack::controller (
# Database
db_host => $db_host,
# Network
network_manager => $network_manager,
network_config => $network_config,
private_interface => $private_interface,
public_interface => $public_interface,
#network_manager => $network_manager,
floating_range => $floating_range,
fixed_range => $fixed_range,
public_address => $public_address,

11
manifests/db/mysql.pp
View File

@@ -38,6 +38,7 @@ class openstack::db::mysql (
$glance_db_password,
$nova_db_password,
$cinder_db_password,
$quantum_db_password,
# MySQL
$mysql_bind_address = '0.0.0.0',
$mysql_account_security = true,
@@ -54,6 +55,9 @@ class openstack::db::mysql (
# Cinder
$cinder_db_user = 'cinder',
$cinder_db_dbname = 'cinder',
# quantum
$quantum_db_user = 'quantum',
$quantum_db_dbname = 'quantum',
$enabled = true
) {
@@ -103,5 +107,12 @@ class openstack::db::mysql (
dbname => $cinder_db_dbname,
allowed_hosts => $allowed_hosts,
}
class { 'quantum::db::mysql':
user => $quantum_db_user,
password => $quantum_db_password,
dbname => $quantum_db_dbname,
allowed_hosts => $allowed_hosts,
}
}
}

70
manifests/keystone.pp
View File

@@ -46,28 +46,33 @@ class openstack::keystone (
$glance_user_password,
$nova_user_password,
$cinder_user_password,
$quantum_user_password,
$public_address,
$db_type = 'mysql',
$db_user = 'keystone',
$db_name = 'keystone',
$admin_tenant = 'admin',
$verbose = 'False',
$bind_host = '0.0.0.0',
$internal_address = false,
$admin_address = false,
$glance_public_address = false,
$glance_internal_address = false,
$glance_admin_address = false,
$nova_public_address = false,
$nova_internal_address = false,
$nova_admin_address = false,
$cinder_public_address = false,
$cinder_internal_address = false,
$cinder_admin_address = false,
$glance = true,
$nova = true,
$cinder = true,
$enabled = true
$db_type = 'mysql',
$db_user = 'keystone',
$db_name = 'keystone',
$admin_tenant = 'admin',
$verbose = 'False',
$bind_host = '0.0.0.0',
$internal_address = false,
$admin_address = false,
$glance_public_address = false,
$glance_internal_address = false,
$glance_admin_address = false,
$nova_public_address = false,
$nova_internal_address = false,
$nova_admin_address = false,
$cinder_public_address = false,
$cinder_internal_address = false,
$cinder_admin_address = false,
$quantum_public_address = false,
$quantum_internal_address = false,
$quantum_admin_address = false,
$glance = true,
$nova = true,
$cinder = true,
$quantum = true,
$enabled = true
) {
# Install and configure Keystone
@@ -134,6 +139,21 @@ class openstack::keystone (
} else {
$cinder_admin_real = $cinder_internal_real
}
if($quantum_public_address) {
$quantum_public_real = $quantum_public_address
} else {
$quantum_public_real = $public_address
}
if($quantum_internal_address) {
$quantum_internal_real = $quantum_internal_address
} else {
$quantum_internal_real = $quantum_public_real
}
if($quantum_admin_address) {
$quantum_admin_real = $quantum_admin_address
} else {
$quantum_admin_real = $quantum_internal_real
}
class { '::keystone':
log_verbose => $verbose,
@@ -188,6 +208,14 @@ class openstack::keystone (
internal_address => $cinder_internal_real,
}
}
if $quantum {
class { 'quantum::keystone::auth':
password => $quantum_user_password,
public_address => $quantum_public_real,
admin_address => $quantum_admin_real,
internal_address => $quantum_internal_real,
}
}
}
}

28
manifests/nova/controller.pp
View File

@@ -30,10 +30,6 @@ class openstack::nova::controller (
$nova_user_password,
$nova_db_password,
# Network
$network_manager = 'nova.network.manager.FlatDHCPManager',
$network_config = {},
$public_interface = 'eth0',
$private_interface = 'eth1',
$fixed_range = '10.0.0.0/24',
$floating_range = false,
$internal_address = $public_address,
@@ -135,18 +131,18 @@ class openstack::nova::controller (
$really_create_networks = false
}
class { 'nova::network':
private_interface => $private_interface,
public_interface => $public_interface,
fixed_range => $fixed_range,
floating_range => $floating_range,
network_manager => $network_manager,
config_overrides => $network_config,
create_networks => $really_create_networks,
num_networks => $num_networks,
enabled => $enable_network_service,
install_service => $enable_network_service,
}
#class { 'nova::network':
# private_interface => $private_interface,
# public_interface => $public_interface,
# fixed_range => $fixed_range,
# floating_range => $floating_range,
# network_manager => $network_manager,
# config_overrides => $network_config,
# create_networks => $really_create_networks,
# num_networks => $num_networks,
# enabled => $enable_network_service,
# install_service => $enable_network_service,
#}
if $auto_assign_floating_ip {
nova_config { 'auto_assign_floating_ip': value => 'True' }