Merge pull request #35 from bodepd/feature/master/various_fixes
Various fixes:
This commit is contained in:
commit
db4bf30fd9
|
@ -22,8 +22,9 @@ class nova::controller(
|
||||||
$available_ips = '256',
|
$available_ips = '256',
|
||||||
|
|
||||||
$image_service = 'nova.image.glance.GlanceImageService',
|
$image_service = 'nova.image.glance.GlanceImageService',
|
||||||
$glance_host = 'localhost',
|
$glance_api_servers = 'localhost:9292',
|
||||||
$glance_port = '9292',
|
$glance_host = undef,
|
||||||
|
$glance_port = undef,
|
||||||
|
|
||||||
$admin_user = 'novaadmin',
|
$admin_user = 'novaadmin',
|
||||||
$project_name = 'nova',
|
$project_name = 'nova',
|
||||||
|
@ -32,23 +33,11 @@ class nova::controller(
|
||||||
) {
|
) {
|
||||||
|
|
||||||
|
|
||||||
# work around hostname bug, LP #653405
|
|
||||||
host { $hostname:
|
|
||||||
ip => $ipaddress,
|
|
||||||
host_aliases => $fqdn,
|
|
||||||
}
|
|
||||||
class { 'nova::rabbitmq':
|
|
||||||
port => $rabbit_port,
|
|
||||||
userid => $rabbit_userid,
|
|
||||||
password => $rabbit_password,
|
|
||||||
virtual_host => $rabbit_virtual_host,
|
|
||||||
require => Host[$hostname],
|
|
||||||
}
|
|
||||||
|
|
||||||
class { "nova":
|
class { "nova":
|
||||||
verbose => $verbose,
|
verbose => $verbose,
|
||||||
sql_connection => "mysql://${db_user}:${db_password}@${db_host}/${db_name}",
|
sql_connection => "mysql://${db_user}:${db_password}@${db_host}/${db_name}",
|
||||||
image_service => $image_service,
|
image_service => $image_service,
|
||||||
|
glance_api_servers => $glance_api_servers,
|
||||||
glance_host => $glance_host,
|
glance_host => $glance_host,
|
||||||
glance_port => $glance_port,
|
glance_port => $glance_port,
|
||||||
rabbit_host => $rabbit_host,
|
rabbit_host => $rabbit_host,
|
||||||
|
@ -86,13 +75,4 @@ class nova::controller(
|
||||||
available_ips => $available_ips,
|
available_ips => $available_ips,
|
||||||
require => Nova::Manage::Project[$project_name],
|
require => Nova::Manage::Project[$project_name],
|
||||||
}
|
}
|
||||||
|
|
||||||
# set up glance server
|
|
||||||
class { 'glance::api':
|
|
||||||
swift_store_user => 'foo_user',
|
|
||||||
swift_store_key => 'foo_pass',
|
|
||||||
}
|
|
||||||
|
|
||||||
class { 'glance::registry': }
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,6 +6,8 @@ class nova(
|
||||||
# these glance params should be optional
|
# these glance params should be optional
|
||||||
# this should probably just be configured as a glance client
|
# this should probably just be configured as a glance client
|
||||||
$glance_api_servers = 'localhost:9292',
|
$glance_api_servers = 'localhost:9292',
|
||||||
|
$glance_host = 'localhost',
|
||||||
|
$glance_port = '9292',
|
||||||
$allow_admin_api = false,
|
$allow_admin_api = false,
|
||||||
$rabbit_host = 'localhost',
|
$rabbit_host = 'localhost',
|
||||||
$rabbit_password='guest',
|
$rabbit_password='guest',
|
||||||
|
@ -29,8 +31,12 @@ class nova(
|
||||||
notify +> Exec['post-nova_config']
|
notify +> Exec['post-nova_config']
|
||||||
}
|
}
|
||||||
# TODO - why is this required?
|
# TODO - why is this required?
|
||||||
package { ['python', 'python-greenlet']:
|
package { 'python':
|
||||||
ensure => present
|
ensure => present,
|
||||||
|
}
|
||||||
|
package { 'python-greenlet':
|
||||||
|
ensure => present,
|
||||||
|
require => Package['python'],
|
||||||
}
|
}
|
||||||
|
|
||||||
class { 'nova::utilities': }
|
class { 'nova::utilities': }
|
||||||
|
@ -102,6 +108,8 @@ class nova(
|
||||||
if $image_service == 'nova.image.glance.GlanceImageService' {
|
if $image_service == 'nova.image.glance.GlanceImageService' {
|
||||||
nova_config {
|
nova_config {
|
||||||
'glance_api_servers': value => $glance_api_servers;
|
'glance_api_servers': value => $glance_api_servers;
|
||||||
|
'glance_host': value => $glance_host;
|
||||||
|
'glance_port': value => $glance_port;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
define nova::manage::admin {
|
define nova::manage::admin {
|
||||||
|
|
||||||
File['/etc/nova/nova.conf'] -> Nova::Manage::Admin[$name]
|
File['/etc/nova/nova.conf'] -> Nova_admin[$name]
|
||||||
Exec<| title == 'initial-db-sync' |> -> Nova_admin[$name]
|
Exec<| title == 'initial-db-sync' |> -> Nova_admin[$name]
|
||||||
|
|
||||||
nova_admin{ $name:
|
nova_admin{ $name:
|
||||||
|
|
|
@ -13,6 +13,12 @@ class nova::rabbitmq(
|
||||||
# only configure nova after the queue is up
|
# only configure nova after the queue is up
|
||||||
Class['rabbitmq::service'] -> Package<| title == 'nova-common' |>
|
Class['rabbitmq::service'] -> Package<| title == 'nova-common' |>
|
||||||
|
|
||||||
|
# work around hostname bug, LP #653405
|
||||||
|
host { $hostname:
|
||||||
|
ip => $ipaddress,
|
||||||
|
host_aliases => $fqdn,
|
||||||
|
}
|
||||||
|
|
||||||
if $install_repo {
|
if $install_repo {
|
||||||
# this is debian specific
|
# this is debian specific
|
||||||
class { 'rabbitmq::repo::apt':
|
class { 'rabbitmq::repo::apt':
|
||||||
|
|
Loading…
Reference in New Issue