stackforge/puppet-openstack_dev_env
Code Issues Proposed changes

Merge pull request #16 from bodepd/refactor

Browse Source 
Refactor
This commit is contained in:
Dan Bode
2012-10-29 18:51:01 -07:00
parent 30d0081e18 a76d39ebf2
commit 5e3cf3257e
5 changed files with 262 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Puppetfile
View File

@@ -7,6 +7,7 @@ mod 'puppetlabs/keystone', :git => 'git://github.com/puppetlabs/puppetlabs-keyst
mod 'puppetlabs/horizon', :git => 'git://github.com/puppetlabs/puppetlabs-horizon'
mod 'puppetlabs/swift', :git => 'git://github.com/puppetlabs/puppetlabs-swift'
mod 'puppetlabs/cinder', :git => 'git://github.com/puppetlabs/puppetlabs-cinder'
mod 'puppetlabs/tempest', :git => 'git://github.com/puppetlabs/puppetlabs-tempest'
mod 'puppet/quantum', :git => 'git://github.com/bodepd/openstack-quantum-puppet/'
# openstack middleware
mod 'puppet/vswitch', :git => 'git://github.com/ekarlso/puppet-vswitch'

3
Vagrantfile vendored
View File

@@ -63,12 +63,13 @@ Vagrant::Config.run do |config|
'memory' => 512,
'ip1' => '172.16.0.10'
}
},
{ 'openstack_all' => { 'memory' => 2512, 'ip1' => '172.16.0.11'} }
#{'compute_1' =>
# {'ip1' => '172.16.0.4'}
#},
#{'compute_2' =>
# {'ip1' => '172.16.0.5'}
}
].each do |hash|

70
manifests/scenarios/all_in_one.pp Normal file
View File

@@ -0,0 +1,70 @@
#
# deploys a single all in one installation
# uses variables set in site.pp
#
#
node /openstack-all/ {
keystone_config {
'DEFAULT/log_config': ensure => absent,
}
class { 'openstack::test_file':
quantum => $use_quantum,
}
# create a test volume on a loopback device for testing
class { 'cinder::setup_test_volume': } -> Service<||>
include 'apache'
class { 'openstack::all':
public_address => $ipaddress_eth1,
internal_address => $ipaddress_eth1,
public_interface => $public_interface,
private_interface => $private_interface,
mysql_root_password => $mysql_root_password,
secret_key => $secret_key,
admin_email => $admin_email,
admin_password => $admin_password,
keystone_db_password => $keystone_db_password,
keystone_admin_token => $admin_token,
nova_db_password => $nova_db_password,
nova_user_password => $nova_user_password,
glance_db_password => $glance_db_password,
glance_user_password => $glance_user_password,
quantum_user_password => $quantum_user_password,
quantum_db_password => $quantum_db_password,
cinder_user_password => $cinder_user_password,
cinder_db_password => $cinder_db_password,
rabbit_password => $rabbit_password,
rabbit_user => $rabbit_user,
libvirt_type => $libvirt_type,
floating_range => $floating_network_range,
fixed_range => $fixed_network_range,
verbose => $verbose,
auto_assign_floating_ip => $auto_assign_floating_ip,
quantum => $use_quantum,
#vncproxy_host => $ipaddress_eth1,
}
class { 'openstack::auth_file':
admin_password => $admin_password,
keystone_admin_token => $keystone_admin_token,
controller_node => '127.0.0.1',
}
# TODO not sure why this is required
# this has a bug, and is constantly added to the file
Package['libvirt'] ->
file_line { 'quemu_hack':
line => 'cgroup_device_acl = [
"/dev/null", "/dev/full", "/dev/zero",
"/dev/random", "/dev/urandom",
"/dev/ptmx", "/dev/kvm", "/dev/kqemu",
"/dev/rtc", "/dev/hpet", "/dev/net/tun",]',
path => '/etc/libvirt/qemu.conf',
ensure => present,
} ~> Service['libvirt']
}

129
manifests/scenarios/multi_role.pp Normal file
View File

@@ -0,0 +1,129 @@
#
# this file contains instructions for installing
# a multi-role deployments
#
#### 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'
node /mysql/ {
class { 'openstack::db::mysql':
mysql_root_password => $mysql_root_password,
keystone_db_password => $keystone_db_password,
glance_db_password => $glance_db_password,
nova_db_password => $nova_db_password,
cinder_db_password => $cinder_db_password,
quantum_db_password => $quantum_db_password,
allowed_hosts => $allowed_hosts,
}
}
node /keystone/ {
# TODO keystone logging seems to be totally broken in folsom
# this can be removed once it starts working
keystone_config {
'DEFAULT/log_config': ensure => absent,
}
class { 'openstack::keystone':
db_host => $mysql_host,
db_password => $keystone_db_password,
admin_token => $admin_token,
admin_email => $admin_email,
admin_password => $admin_password,
glance_user_password => $glance_user_password,
nova_user_password => $nova_user_password,
cinder_user_password => $cinder_user_password,
quantum_user_password => $quantum_user_password,
public_address => $keystone_host,
glance_public_address => $glance_host,
nova_public_address => $nova_host,
verbose => $verbose,
}
}
node /glance/ {
class { 'openstack::glance':
db_host => $mysql_host,
glance_user_password => $glance_user_password,
glance_db_password => $glance_db_password,
keystone_host => $keystone_host,
auth_uri => "http://${keystone_host}:5000/",
verbose => $verbose,
}
class { 'openstack::auth_file':
admin_password => $admin_password,
keystone_admin_token => $admin_token,
controller_node => $keystone_host,
}
}
node /nova-controller/ {
# deploy a script that can be used to test nova
class { 'openstack::test_file': }
class { 'openstack::nova::controller':
public_address => '172.16.0.5',
public_interface => $public_interface,
private_interface => $private_interface,
db_host => '172.16.0.8',
rabbit_password => $rabbit_password,
nova_user_password => $nova_user_password,
nova_db_password => $nova_db_password,
network_manager => 'nova.network.manager.FlatDHCPManager',
verbose => $verbose,
multi_host => true,
glance_api_servers => '172.16.0.6:9292',
keystone_host => '172.16.0.7',
#floating_range => $floating_network_range,
#fixed_range => $fixed_network_range,
}
class { 'openstack::horizon':
secret_key => $secret_key,
cache_server_ip => '127.0.0.1',
cache_server_port => '11211',
swift => false,
quantum => false,
horizon_app_links => undef,
keystone_host => '172.16.0.7',
keystone_default_role => 'Member',
}
class { 'openstack::auth_file':
admin_password => $admin_password,
keystone_admin_token => $admin_token,
controller_node => '172.16.0.7',
}
}
node /nova-compute/ {
fail('nova compute node has not been defined')
}
node /cinder/ {
fail('the individual cinder role is not fully tested yet..')
class { 'cinder':
rabbit_password => $rabbit_password,
# TODO what about the rabbit user?
rabbit_host => $openstack_controller,
sql_connection => "mysql://cinder:${cinder_db_password}@${openstack_controller}/cinder?charset=utf8",
verbose => $verbose,
}
class { 'cinder::volume': }
class { 'cinder::volume::iscsi': }
}

299
manifests/site.pp
View File

@@ -18,7 +18,7 @@ $nova_db_password = 'nova_db_password'
$cinder_db_password = 'cinder_db_password'
$quantum_db_password = 'quantum_db_password'
$allowed_hosts = ['keystone', 'glance', 'novacontroller', 'compute1', '%']
$allowed_hosts = ['%']
# keystone settings
$admin_token = 'service_token'
@@ -31,91 +31,45 @@ $quantum_user_password = 'quantum_user_password'
$verbose = 'True'
$public_interface = 'eth1'
$public_interface = 'eth1'
$private_interface = 'eth2'
$rabbit_password = 'rabbit_password'
$rabbit_user = 'nova'
$rabbit_password = 'rabbit_password'
$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 #################
#### 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 ####
$openstack_controller = '172.16.0.3'
#### controller/compute mode settings ####
node /mysql/ {
class { 'openstack::db::mysql':
mysql_root_password => $mysql_root_password,
keystone_db_password => $keystone_db_password,
glance_db_password => $glance_db_password,
nova_db_password => $nova_db_password,
cinder_db_password => $cinder_db_password,
quantum_db_password => $quantum_db_password,
allowed_hosts => $allowed_hosts,
}
}
node /keystone/ {
# TODO keystone logging seems to be totally broken in folsom
# this can be removed once it starts working
keystone_config {
'DEFAULT/log_config': ensure => absent,
}
class { 'openstack::keystone':
db_host => $mysql_host,
db_password => $keystone_db_password,
admin_token => $admin_token,
admin_email => $admin_email,
admin_password => $admin_password,
glance_user_password => $glance_user_password,
nova_user_password => $nova_user_password,
cinder_user_password => $cinder_user_password,
quantum_user_password => $quantum_user_password,
public_address => $keystone_host,
glance_public_address => $glance_host,
nova_public_address => $nova_host,
verbose => $verbose,
}
}
node /glance/ {
class { 'openstack::glance':
db_host => $mysql_host,
glance_user_password => $glance_user_password,
glance_db_password => $glance_db_password,
keystone_host => $keystone_host,
auth_uri => "http://${keystone_host}:5000/",
verbose => $verbose,
}
class { 'openstack::auth_file':
admin_password => $admin_password,
keystone_admin_token => $admin_token,
controller_node => $keystone_host,
}
}
# node declaration for all in one
import 'scenarios/all_in_one.pp'
# node declarations for a single server per role
import 'scenarios/multi_role.pp'
node /openstack-controller/ {
# 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':
quantum => $use_quantum,
}
include apache
@@ -143,6 +97,7 @@ node /openstack-controller/ {
cinder_user_password => $cinder_user_password,
cinder => true,
# quantum
quantum => $use_quantum,
quantum_db_password => $quantum_db_password,
quantum_user_password => $quantum_user_password,
# Required Horizon
@@ -150,8 +105,8 @@ node /openstack-controller/ {
secret_key => $secret_key,
# need to sort out networking...
network_manager => 'nova.network.manager.FlatDHCPManager',
fixed_range => '10.0.0.0/24',
floating_range => '172.16.0.64/25',
fixed_range => $fixed_network_range,
floating_range => $floating_network_range,
create_networks => true,
multi_host => true,
db_host => '127.0.0.1',
@@ -168,44 +123,12 @@ node /openstack-controller/ {
cache_server_ip => '127.0.0.1',
cache_server_port => '11211',
swift => false,
quantum => true,
horizon_app_links => undef,
# Genera
verbose => $verbose,
purge_nova_config => false,
}
# # set up a quantum server
class { 'quantum':
rabbit_user => $rabbit_user,
rabbit_password => $rabbit_password,
sql_connection => "mysql://quantum:${quantum_db_password}@localhost/quantum?charset=utf8",
}
class { 'quantum::server':
keystone_password => $quantum_user_password,
}
class { 'quantum::plugins::ovs':
sql_connection => "mysql://quantum:${quantum_db_password}@localhost/quantum?charset=utf8",
tenant_network_type => 'gre',
# I need to know what this does...
local_ip => '10.0.0.1',
}
class { 'nova::network::quantum':
#$fixed_range,
quantum_admin_password => $quantum_user_password,
#$use_dhcp = 'True',
#$public_interface = undef,
quantum_connection_host => 'localhost',
quantum_auth_strategy => 'keystone',
quantum_url => "http://${openstack_controller}:9696",
quantum_admin_tenant_name => 'services',
#quantum_admin_username => 'quantum',
quantum_admin_auth_url => "http://${openstack_controller}:35357/v2.0",
}
package { 'python-cliff':
ensure => present,
}
@@ -221,86 +144,22 @@ node /openstack-controller/ {
}
}
node /cinder/ {
class { 'cinder':
rabbit_password => $rabbit_password,
# TODO what about the rabbit user?
rabbit_host => $openstack_controller,
sql_connection => "mysql://cinder:${cinder_db_password}@${openstack_controller}/cinder?charset=utf8",
verbose => $verbose,
}
class { 'cinder::volume': }
class { 'cinder::volume::iscsi': }
}
node /nova-controller/ {
# 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::nova::controller':
public_address => '172.16.0.5',
public_interface => $public_interface,
private_interface => $private_interface,
db_host => '172.16.0.8',
rabbit_password => $rabbit_password,
nova_user_password => $nova_user_password,
nova_db_password => $nova_db_password,
network_manager => 'nova.network.manager.FlatDHCPManager',
verbose => $verbose,
multi_host => true,
glance_api_servers => '172.16.0.6:9292',
keystone_host => '172.16.0.7',
#floating_range => $floating_network_range,
#fixed_range => $fixed_network_range,
}
class { 'openstack::horizon':
secret_key => $secret_key,
cache_server_ip => '127.0.0.1',
cache_server_port => '11211',
swift => false,
quantum => false,
horizon_app_links => undef,
keystone_host => '172.16.0.7',
keystone_default_role => 'Member',
}
class { 'openstack::auth_file':
admin_password => $admin_password,
keystone_admin_token => $admin_token,
controller_node => '172.16.0.7',
}
}
node /compute/ {
# TODO not sure why this is required
Package['libvirt'] ->
file_line { 'quemu_hack':
line => 'cgroup_device_acl = [
"/dev/null", "/dev/full", "/dev/zero",
"/dev/random", "/dev/urandom",
"/dev/ptmx", "/dev/kvm", "/dev/kqemu",
"/dev/rtc", "/dev/hpet", "/dev/net/tun",]',
path => '/etc/libvirt/qemu.conf',
ensure => present,
} ~> Service['libvirt']
# deploy a script that can be used to test nova
class { 'openstack::test_file': }
# this has a bug, and is constantly added to the file
if $libvirt_type == 'qemu' {
Package['libvirt'] ->
file_line { 'quemu_hack':
line => 'cgroup_device_acl = [
"/dev/null", "/dev/full", "/dev/zero",
"/dev/random", "/dev/urandom",
"/dev/ptmx", "/dev/kvm", "/dev/kqemu",
"/dev/rtc", "/dev/hpet", "/dev/net/tun",]',
path => '/etc/libvirt/qemu.conf',
ensure => present,
} ~> Service['libvirt']
}
# External lookups.
# $rabbit_connection_hash = collect_rabbit_connection('ipaddress_eth1', 'architecture=amd64')
@@ -316,62 +175,24 @@ node /compute/ {
class { 'cinder::setup_test_volume': } -> Service<||>
class { 'openstack::compute':
internal_address => $::ipaddress_eth1,
libvirt_type => $libvirt_type,
sql_connection => "mysql://nova:${nova_db_password}@${openstack_controller}/nova",
cinder_sql_connection => "mysql://cinder:${cinder_db_password}@${openstack_controller}/cinder",
#multi_host => true,
nova_user_password => $nova_user_password,
rabbit_host => $openstack_controller,
rabbit_password => $rabbit_password,
glance_api_servers => ["${openstack_controller}:9292"],
vncproxy_host => $openstack_controller,
vnc_enabled => true,
verbose => $verbose,
}
# manual steps
# apt-get update
# apt-get upgrade
# apt-get -y install linux-headers-3.2.0-23-generic
# apt-get -y install quantum-plugin-openvswitch-agent
# apt-get -y install openvswitch-datapath-dkms-source
# module-assistant auto-install openvswitch-datapath
# service openvswitch-switch restart
class { 'quantum':
verbose => $verbose,
debug => $verbose,
rabbit_host => $openstack_controller,
rabbit_user => $rabbit_user,
rabbit_password => $rabbit_password,
sql_connection => "mysql://quantum:${quantum_db_password}@${openstack_controller}/quantum?charset=utf8",
}
class { 'quantum::agents::ovs':
bridge_uplinks => ['br-virtual:eth2'],
}
class { 'quantum::agents::dhcp': }
class { 'nova::compute::quantum': }
class { 'nova::network::quantum':
#$fixed_range,
quantum_admin_password => $quantum_user_password,
#$use_dhcp = 'True',
#$public_interface = undef,
quantum_connection_host => $openstack_controller,
#quantum_auth_strategy => 'keystone',
quantum_url => "http://${openstack_controller}:9696",
quantum_admin_tenant_name => 'services',
#quantum_admin_username => 'quantum',
quantum_admin_auth_url => "http://${openstack_controller}:35357/v2.0"
}
nova_config {
'linuxnet_interface_driver': value => 'nova.network.linux_net.LinuxOVSInterfaceDriver';
'linuxnet_ovs_integration_bridge': value => 'br-int';
public_interface => $public_interface,
private_interface => $private_interface,
internal_address => $::ipaddress_eth1,
libvirt_type => $libvirt_type,
sql_connection => "mysql://nova:${nova_db_password}@${openstack_controller}/nova",
cinder_sql_connection => "mysql://cinder:${cinder_db_password}@${openstack_controller}/cinder",
quantum_sql_connection => "mysql://quantum:${quantum_db_password}@${openstack_controller}/quantum?charset=utf8",
multi_host => true,
nova_user_password => $nova_user_password,
quantum_user_password => $quantum_user_password,
rabbit_password => $rabbit_password,
glance_api_servers => ["${openstack_controller}:9292"],
rabbit_host => $openstack_controller,
quantum_host => $openstack_controller,
keystone_host => $openstack_controller,
vncproxy_host => $openstack_controller,
vnc_enabled => true,
verbose => $verbose,
}
}