stackforge/puppet-openstack_dev_env
Code Issues Proposed changes

adjust params

Browse Source
This commit is contained in:
Dan Bode
2012-10-29 18:48:56 -07:00
parent 11a2d0ed7b
commit a76d39ebf2
1 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
manifests/site.pp
View File

@@ -18,7 +18,7 @@ $nova_db_password = 'nova_db_password'
$cinder_db_password = 'cinder_db_password' $cinder_db_password = 'cinder_db_password'
$quantum_db_password = 'quantum_db_password' $quantum_db_password = 'quantum_db_password'
$allowed_hosts = ['keystone', 'glance', 'novacontroller', 'compute1', '%'] $allowed_hosts = ['%']
# keystone settings # keystone settings
$admin_token = 'service_token' $admin_token = 'service_token'
@@ -40,14 +40,21 @@ $rabbit_user = 'nova'
$secret_key = 'secret_key' $secret_key = 'secret_key'
$libvirt_type = 'qemu' $libvirt_type = 'qemu'
#$libvirt_type = 'kvm'
$network_type = 'quantum'
#$network_type = 'nova'
if $network_type == 'nova' {
$use_quantum = false
} else {
$use_quamtum = true
}
$fixed_network_range = '10.0.0.0/24'
$floating_network_range = '172.16.0.128/25'
$auto_assign_floating_ip = false
#### end shared variables ################# #### end shared variables #################
#### controller/compute mode settings ####
$mysql_host = '172.16.0.8'
$keystone_host = '172.16.0.7'
$glance_host = '172.16.0.6'
$nova_host = '172.16.0.5'
#### controller/compute mode settings #### #### controller/compute mode settings ####
$openstack_controller = '172.16.0.3' $openstack_controller = '172.16.0.3'
#### controller/compute mode settings #### #### controller/compute mode settings ####
@@ -60,10 +67,6 @@ import 'scenarios/multi_role.pp'
node /openstack-controller/ { node /openstack-controller/ {
# deploy a script that can be used to test nova # deploy a script that can be used to test nova
class { 'openstack::test_file': }
# class { 'nova::volume': enabled => true }
# class { 'nova::volume::iscsi': }
class { 'openstack::test_file': class { 'openstack::test_file':
quantum => $use_quantum, quantum => $use_quantum,
} }
@@ -144,6 +147,8 @@ node /openstack-controller/ {
node /compute/ { node /compute/ {
# TODO not sure why this is required # TODO not sure why this is required
# this has a bug, and is constantly added to the file
if $libvirt_type == 'qemu' {
Package['libvirt'] -> Package['libvirt'] ->
file_line { 'quemu_hack': file_line { 'quemu_hack':
line => 'cgroup_device_acl = [ line => 'cgroup_device_acl = [
@@ -154,9 +159,7 @@ node /compute/ {
path => '/etc/libvirt/qemu.conf', path => '/etc/libvirt/qemu.conf',
ensure => present, ensure => present,
} ~> Service['libvirt'] } ~> Service['libvirt']
}
# deploy a script that can be used to test nova
class { 'openstack::test_file': }
# External lookups. # External lookups.
# $rabbit_connection_hash = collect_rabbit_connection('ipaddress_eth1', 'architecture=amd64') # $rabbit_connection_hash = collect_rabbit_connection('ipaddress_eth1', 'architecture=amd64')