Refactor comments
This commit just refactors/adds/removes commented lines.
This commit is contained in:
parent
e8edece6f1
commit
914312e30e
@ -1,5 +1,6 @@
|
|||||||
#
|
#
|
||||||
# TODO - this is currently hardcoded to be a xenserver
|
# TODO - this is currently hardcoded to be a xenserver
|
||||||
|
# TODO - this needs to be updated
|
||||||
class nova::all(
|
class nova::all(
|
||||||
$db_password,
|
$db_password,
|
||||||
$db_name = 'nova',
|
$db_name = 'nova',
|
||||||
|
@ -11,8 +11,8 @@ class nova::db(
|
|||||||
Mysql::Db[$dbname] -> Anchor<| title == "nova-start" |>
|
Mysql::Db[$dbname] -> Anchor<| title == "nova-start" |>
|
||||||
Mysql::Db[$dbname] ~> Exec<| title == 'initial-db-sync' |>
|
Mysql::Db[$dbname] ~> Exec<| title == 'initial-db-sync' |>
|
||||||
|
|
||||||
# now this requires storedconfigs
|
|
||||||
# TODO - worry about the security implications
|
# TODO - worry about the security implications
|
||||||
|
# I am not sure if I want to use storeconfigs for this...
|
||||||
@@nova_config { 'database_url':
|
@@nova_config { 'database_url':
|
||||||
value => "mysql://${user}:${password}@${host}/${dbname}",
|
value => "mysql://${user}:${password}@${host}/${dbname}",
|
||||||
tag => $zone,
|
tag => $zone,
|
||||||
@ -25,7 +25,6 @@ class nova::db(
|
|||||||
charset => 'latin1',
|
charset => 'latin1',
|
||||||
# I may want to inject some sql
|
# I may want to inject some sql
|
||||||
require => Class['mysql::server'],
|
require => Class['mysql::server'],
|
||||||
# notify => Exec["initial-db-sync"],
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if $allowed_hosts {
|
if $allowed_hosts {
|
||||||
|
@ -28,6 +28,10 @@ class nova(
|
|||||||
$root_helper = $::nova::params::root_helper
|
$root_helper = $::nova::params::root_helper
|
||||||
) inherits nova::params {
|
) inherits nova::params {
|
||||||
|
|
||||||
|
# all nova_config resources should be applied
|
||||||
|
# after the nova common package
|
||||||
|
# before the file resource for nova.conf is managed
|
||||||
|
# and before the post config resource
|
||||||
Nova_config<| |> {
|
Nova_config<| |> {
|
||||||
require +> Package[$::nova::params::common_package_name],
|
require +> Package[$::nova::params::common_package_name],
|
||||||
before +> File['/etc/nova/nova.conf'],
|
before +> File['/etc/nova/nova.conf'],
|
||||||
@ -40,7 +44,8 @@ class nova(
|
|||||||
group => 'nova',
|
group => 'nova',
|
||||||
}
|
}
|
||||||
|
|
||||||
# TODO - why is this required?
|
# TODO - see if these packages can be removed
|
||||||
|
# they should be handled as package deps by the OS
|
||||||
package { 'python':
|
package { 'python':
|
||||||
ensure => present,
|
ensure => present,
|
||||||
}
|
}
|
||||||
@ -77,6 +82,7 @@ class nova(
|
|||||||
system => true,
|
system => true,
|
||||||
require => Package['nova-common'],
|
require => Package['nova-common'],
|
||||||
}
|
}
|
||||||
|
|
||||||
file { $logdir:
|
file { $logdir:
|
||||||
ensure => directory,
|
ensure => directory,
|
||||||
mode => '0751',
|
mode => '0751',
|
||||||
@ -84,6 +90,9 @@ class nova(
|
|||||||
file { '/etc/nova/nova.conf':
|
file { '/etc/nova/nova.conf':
|
||||||
mode => '0640',
|
mode => '0640',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# I need to ensure that I better understand this resource
|
||||||
|
# this is potentially constantly resyncing a central DB
|
||||||
exec { "nova-db-sync":
|
exec { "nova-db-sync":
|
||||||
command => "/usr/bin/nova-manage db sync",
|
command => "/usr/bin/nova-manage db sync",
|
||||||
refreshonly => "true",
|
refreshonly => "true",
|
||||||
|
@ -14,6 +14,7 @@ class nova::rabbitmq(
|
|||||||
Class['rabbitmq::service'] -> Anchor<| title == 'nova-start' |>
|
Class['rabbitmq::service'] -> Anchor<| title == 'nova-start' |>
|
||||||
|
|
||||||
# work around hostname bug, LP #653405
|
# work around hostname bug, LP #653405
|
||||||
|
# TODO - see if this is still required
|
||||||
host { $hostname:
|
host { $hostname:
|
||||||
ip => $ipaddress,
|
ip => $ipaddress,
|
||||||
host_aliases => $fqdn,
|
host_aliases => $fqdn,
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
require 'spec_helper'
|
require 'spec_helper'
|
||||||
|
|
||||||
describe 'nova' do
|
describe 'nova' do
|
||||||
|
|
||||||
let :facts do
|
let :facts do
|
||||||
{ :osfamily => 'Debian' }
|
{ :osfamily => 'Debian' }
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user