Browse Source

Variety of changes to get the nova all test to run

changes/27/26227/1
Chris Blumentritt 10 years ago
parent
commit
d8208ab974
  1. 6
      nova/manifests/all.pp
  2. 2
      nova/manifests/api.pp
  3. 4
      nova/manifests/db.pp
  4. 7
      nova/manifests/init.pp
  5. 2
      nova/manifests/network.pp
  6. 2
      nova/manifests/objectstore.pp
  7. 2
      nova/manifests/scheduler.pp
  8. 5
      nova/tests/all.pp

6
nova/manifests/all.pp

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

2
nova/manifests/api.pp

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

4
nova/manifests/db.pp

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

7
nova/manifests/init.pp

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

2
nova/manifests/network.pp

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

2
nova/manifests/objectstore.pp

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

2
nova/manifests/scheduler.pp

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

5
nova/tests/all.pp

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

Loading…
Cancel
Save