updated canonical specific openstack code
- to reflect changes to nova class.
This commit is contained in:
parent
c99f1f7415
commit
f7bde6dd83
|
@ -2,19 +2,22 @@
|
|||
# TODO - this is currently hardcoded to be a xenserver
|
||||
class nova::canonical::all(
|
||||
$logdir,
|
||||
$verbose,
|
||||
$sql_connection='mysql://root:<password>@127.0.0.1/nova',
|
||||
$verbose = false,
|
||||
$db_password,
|
||||
$db_name = 'nova',
|
||||
$db_user = 'nova',
|
||||
$db_host = 'localhost',
|
||||
$network_manager,
|
||||
$image_service,
|
||||
$flat_network_bridge = 'xenbr0',
|
||||
$flat_network_bridge = 'br100',
|
||||
$glance_host,
|
||||
$glance_port,
|
||||
$allow_admin_api = 'true',
|
||||
$rabbit_host=$::ipaddress,
|
||||
$rabbit_password,
|
||||
$rabbit_port,
|
||||
$rabbit_userid,
|
||||
$rabbit_virtual_host,
|
||||
$rabbit_host = undef,
|
||||
$rabbit_password = unfef,
|
||||
$rabbit_port = undef,
|
||||
$rabbit_userid = undef,
|
||||
$rabbit_virtual_host = undef,
|
||||
$state_path,
|
||||
$lock_path,
|
||||
$service_down_time,
|
||||
|
@ -22,10 +25,12 @@ class nova::canonical::all(
|
|||
# they are only supporting libvirt for now
|
||||
) {
|
||||
|
||||
class { 'nova::rabbitmq': }
|
||||
|
||||
class { "nova":
|
||||
logdir => $logdir,
|
||||
verbose => $verbose,
|
||||
sql_connection => $sql_connection,
|
||||
sql_connection => "mysql://${db_user}:${db_password}@${db_host}/${db_name}",
|
||||
network_manager => $network_manager,
|
||||
image_service => $image_service,
|
||||
flat_network_bridge => $flat_network_bridge,
|
||||
|
@ -52,9 +57,9 @@ class nova::canonical::all(
|
|||
class { "nova::scheduler": enabled => false }
|
||||
class { 'nova::db':
|
||||
# pass in db config as params
|
||||
password => 'password',
|
||||
name => 'nova',
|
||||
user => 'nova',
|
||||
host => 'localhost',
|
||||
password => $db_password,
|
||||
name => $db_name,
|
||||
user => $db_user,
|
||||
host => $db_host,
|
||||
}
|
||||
}
|
||||
|
|
|
@ -9,35 +9,23 @@ class { 'mysql::server':
|
|||
class { 'nova::canonical::all':
|
||||
#dhcpbridge_flagfile=/etc/nova/nova.conf
|
||||
#dhcpbridge=/usr/bin/nova-dhcpbridge
|
||||
#verbose => true,
|
||||
#s3_host=192.168.25.30
|
||||
#rabbit_host=192.168.25.30
|
||||
#cc_host=192.168.25.30
|
||||
#ec2_url=http://192.168.25.30:8773/services/Cloud
|
||||
#fixed_range=10.0.0.0/32
|
||||
#network_size=255
|
||||
#FAKE_subdomain=ec2
|
||||
#routing_source_ip=192.168.25.30
|
||||
#verbose
|
||||
#sql_connection=mysql://root:pass@192.168.25.30/nova
|
||||
#network_manager=nova.network.manager.FlatManager
|
||||
verbose => 'true',
|
||||
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',
|
||||
flat_network_bridge => 'xenbr0',
|
||||
glance_host => 'glance_ip_address',
|
||||
glance_port => '9292',
|
||||
allow_admin_api => 'true',
|
||||
rabbit_host => 'rabbit_ip_address',
|
||||
rabbit_password => 'rabbitpassword',
|
||||
rabbit_port => '5672',
|
||||
rabbit_userid => 'rabbit_user',
|
||||
rabbit_virtual_host => '/',
|
||||
state_path => '/var/lib/nova',
|
||||
lock_path => '/var/lock/nova',
|
||||
service_down_time => '180000000',
|
||||
host => $ipaddress,
|
||||
|
||||
host => $hostname,
|
||||
db_password => 'password',
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue