openstack
/
puppet-nova
Code Issues Proposed changes

Variety of changes to get the nova all test to run

This commit is contained in:
Chris Blumentritt 2011-05-29 18:13:00 -05:00
parent 87a5091e3a
commit d8208ab974
8 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/manifests/all.pp
View File

@ -6,6 +6,7 @@ class nova::all(
$sql_connection, $sql_connection,
$network_manager, $network_manager,
$image_service, $image_service,
$logdir,
$verbose = 'undef', $verbose = 'undef',
$nodaemon = 'undef', $nodaemon = 'undef',
$flat_network_bridge = 'xenbr0', $flat_network_bridge = 'xenbr0',
@ -18,7 +19,10 @@ class nova::all(
$ipv6_backend = 'account_identifier' $ipv6_backend = 'account_identifier'
) { ) {
class { "nova": } class { "nova":
sql_connection => sql_connection
}
class { "nova::api": enabled => false } class { "nova::api": enabled => false }
class { "nova::compute": enabled => false } class { "nova::compute": enabled => false }
class { "nova::network": enabled => false } class { "nova::network": enabled => false }

2
nova/manifests/api.pp
View File

@ -14,6 +14,6 @@ class nova::api($enabled=false) inherits nova {
ensure => $service_ensure, ensure => $service_ensure,
enable => $enabled, enable => $enabled,
require => Package["nova-api"], require => Package["nova-api"],
subscribe => File["/etc/nova/nova.conf"] #subscribe => File["/etc/nova/nova.conf"]
} }
} }

4
nova/manifests/db.pp
View File

@ -5,8 +5,8 @@ class nova::db(
$host = 'localhost' $host = 'localhost'
) { ) {
mysql::db { $name: mysql::db { $name:
user => $user, db_user => $user,
password => $password, db_pw => $password,
host => $host, host => $host,
# I may want to inject some sql # I may want to inject some sql
# sql='', # sql='',

7
nova/manifests/init.pp
View File

@ -1,10 +1,9 @@
class nova( class nova(
$verbose = false, $verbose = false,
$nodaemon = false $nodaemon = false,
$logdir = '' $logdir = '',
$sql_connection, $sql_connection
# just for network? # just for network?
$network_manager
) { ) {
class { 'puppet': } class { 'puppet': }

2
nova/manifests/network.pp
View File

@ -15,6 +15,6 @@ class nova::network( $enabled=false ) inherits nova {
ensure => $service_ensure, ensure => $service_ensure,
enable => $enabled, enable => $enabled,
require => Package["nova-network"], require => Package["nova-network"],
subscribe => File["/etc/nova/nova.conf"] #subscribe => File["/etc/nova/nova.conf"]
} }
} }

2
nova/manifests/objectstore.pp
View File

@ -15,6 +15,6 @@ class nova::objectstore( $enabled=false ) inherits nova {
ensure => $service_ensure, ensure => $service_ensure,
enable => $enabled, enable => $enabled,
require => Package["nova-objectstore"], require => Package["nova-objectstore"],
subscribe => File["/etc/nova/nova.conf"] #subscribe => File["/etc/nova/nova.conf"]
} }
} }

2
nova/manifests/scheduler.pp
View File

@ -15,6 +15,6 @@ class nova::scheduler( $enabled ) inherits nova {
ensure => $service_ensure, ensure => $service_ensure,
enable => $enabled, enable => $enabled,
require => Package["nova-scheduler"], require => Package["nova-scheduler"],
subscribe => File["/etc/nova/nova.conf"] #subscribe => File["/etc/nova/nova.conf"]
} }
} }

5
nova/tests/all.pp
View File

@ -3,18 +3,19 @@ stage { 'repo-setup':
} }
class { 'apt': class { 'apt':
disable_keys => true, disable_keys => true,
always_apt_update => true, #always_apt_update => true,
stage => 'repo-setup', stage => 'repo-setup',
} }
class { 'nova::repo': class { 'nova::repo':
stage => 'repo-setup', stage => 'repo-setup',
} }
class { 'mysql::server': class { 'mysql::server':
root_password => 'password' mysql_root_pw => 'password'
} }
class { 'nova::all': class { 'nova::all':
verbose => 'undef', verbose => 'undef',
nodaemon => 'undef', nodaemon => 'undef',
logdir => '/var/log/nova',
sql_connection => 'mysql://root:<password>@127.0.0.1/nova', sql_connection => 'mysql://root:<password>@127.0.0.1/nova',
network_manager => 'nova.network.manager.FlatManager', network_manager => 'nova.network.manager.FlatManager',
image_service => 'nova.image.glance.GlanceImageService', image_service => 'nova.image.glance.GlanceImageService',