Remove Ubuntu speific classes
These classes are part of a lagacy implementation that no longer exists. They are being removed as deprecated clutter
This commit is contained in:
Dan Bode
parent
140086c9c3
commit
1581a56d39
|
|
@ -1,85 +0,0 @@
|
|||
#
|
||||
# TODO - this is currently hardcoded to be a xenserver
|
||||
class nova::ubuntu::all(
|
||||
$db_password,
|
||||
$db_name = 'nova',
|
||||
$db_user = 'nova',
|
||||
$db_host = 'localhost',
|
||||
|
||||
$rabbit_port = undef,
|
||||
$rabbit_userid = undef,
|
||||
$rabbit_password = undef,
|
||||
$rabbit_virtual_host = undef,
|
||||
$rabbit_host = undef,
|
||||
|
||||
$flat_network_bridge = 'br100',
|
||||
$flat_network_bridge_ip = '11.0.0.1',
|
||||
$flat_network_bridge_netmask = '255.255.255.0',
|
||||
|
||||
$nova_network = '11.0.0.0/24',
|
||||
$available_ips = '256',
|
||||
|
||||
$image_service = undef,
|
||||
$glance_api_servers = 'localhost:9292',
|
||||
|
||||
$admin_user = 'novaadmin',
|
||||
$project_name = 'nova',
|
||||
|
||||
$verbose = undef
|
||||
) {
|
||||
|
||||
class { 'nova::rabbitmq':
|
||||
port => $rabbit_port,
|
||||
userid => $rabbit_userid,
|
||||
password => $rabbit_password,
|
||||
virtual_host => $rabbit_virtual_host,
|
||||
}
|
||||
|
||||
class { "nova":
|
||||
verbose => $verbose,
|
||||
sql_connection => "mysql://${db_user}:${db_password}@${db_host}/${db_name}",
|
||||
image_service => $image_service,
|
||||
glance_api_servers => $glance_api_servers,
|
||||
rabbit_host => $rabbit_host,
|
||||
rabbit_port => $rabbit_port,
|
||||
rabbit_userid => $rabbit_userid,
|
||||
rabbit_password => $rabbit_password,
|
||||
rabbit_virtual_host => $rabbit_virtual_host,
|
||||
}
|
||||
|
||||
class { "nova::api": enabled => true }
|
||||
|
||||
class { "nova::compute":
|
||||
api_server => $ipaddress,
|
||||
enabled => true,
|
||||
}
|
||||
|
||||
class { "nova::network::flat":
|
||||
enabled => true,
|
||||
flat_network_bridge => $flat_network_bridge,
|
||||
flat_network_bridge_ip => $flat_network_bridge_ip,
|
||||
flat_network_bridge_netmask => $flat_network_bridge_netmask,
|
||||
}
|
||||
|
||||
class { "nova::objectstore": enabled => true }
|
||||
class { "nova::scheduler": enabled => true }
|
||||
class { 'nova::db':
|
||||
# pass in db config as params
|
||||
password => $db_password,
|
||||
dbname => $db_name,
|
||||
user => $db_user,
|
||||
host => $db_host,
|
||||
}
|
||||
|
||||
nova::manage::admin { $admin_user: }
|
||||
nova::manage::project { $project_name:
|
||||
owner => $admin_user,
|
||||
}
|
||||
|
||||
nova::manage::network { "${project_name}-net-${nova_network}":
|
||||
network => $nova_network,
|
||||
available_ips => $available_ips,
|
||||
require => Nova::Manage::Project[$project_name],
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,71 +0,0 @@
|
|||
#
|
||||
# TODO - this is currently hardcoded to be a xenserver
|
||||
class nova::ubuntu::cc (
|
||||
$db_password,
|
||||
$db_name = 'nova',
|
||||
$db_user = 'nova',
|
||||
$db_host = 'localhost',
|
||||
$db_allowed_hosts = undef,
|
||||
|
||||
$flat_network_bridge = 'br100',
|
||||
$flat_network_bridge_ip = '11.0.0.1',
|
||||
$flat_network_bridge_netmask = '255.255.255.0',
|
||||
|
||||
$image_service = 'nova.image.local.LocalImageService',
|
||||
|
||||
$glance_api_servers = 'localhost:9292',
|
||||
|
||||
$nova_network = '11.0.0.0/24',
|
||||
$available_ips = '256',
|
||||
|
||||
$admin_user = 'novaadmin',
|
||||
$project_name = 'nova'
|
||||
) {
|
||||
|
||||
class { 'nova::rabbitmq':
|
||||
port => $rabbitmq_port,
|
||||
userid => $rabbitmq_userid,
|
||||
password => $rabbitmq_password,
|
||||
virtual_host => $rabbitmq_virtual_host,
|
||||
}
|
||||
|
||||
class { "nova":
|
||||
logdir => $logdir,
|
||||
verbose => $verbose,
|
||||
sql_connection => "mysql://${db_user}:${db_password}@${db_host}/${db_name}",
|
||||
image_service => $image_service,
|
||||
glance_api_servers => $glance_api_servers,
|
||||
}
|
||||
|
||||
class { "nova::api": enabled => true }
|
||||
|
||||
class { "nova::network::flat":
|
||||
enabled => true,
|
||||
flat_network_bridge => $flat_network_bridge,
|
||||
flat_network_bridge_ip => $flat_network_bridge_ip,
|
||||
flat_network_bridge_netmask => $flat_network_bridge_netmask,
|
||||
}
|
||||
|
||||
class { "nova::objectstore": enabled => true }
|
||||
class { "nova::scheduler": enabled => true }
|
||||
class { 'nova::db':
|
||||
# pass in db config as params
|
||||
password => $db_password,
|
||||
dbname => $db_name,
|
||||
user => $db_user,
|
||||
host => $db_host,
|
||||
allowed_hosts => $db_allowed_hosts,
|
||||
}
|
||||
|
||||
nova::manage::admin { $admin_user: }
|
||||
nova::manage::project { $project_name:
|
||||
owner => $admin_user,
|
||||
}
|
||||
|
||||
nova::manage::network { "${project_name}-net-${nova_network}":
|
||||
network => $nova_network,
|
||||
available_ips => $available_ips,
|
||||
require => Nova::Manage::Project[$project_name],
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
# compute.pp
|
||||
class nova::ubuntu::compute (
|
||||
$api_server,
|
||||
$rabbit_host,
|
||||
$db_host,
|
||||
|
||||
# default to local image service.
|
||||
$image_service = undef,
|
||||
$glance_api_servers = undef,
|
||||
$flat_network_bridge,
|
||||
$flat_network_bridge_ip,
|
||||
$flat_network_bridge_netmask,
|
||||
$rabbit_port = undef,
|
||||
$rabbit_userid = undef,
|
||||
$rabbit_virtual_host = undef,
|
||||
$db_user = 'nova',
|
||||
$db_password = 'nova',
|
||||
$db_name = 'nova',
|
||||
$enabled = 'false'
|
||||
) {
|
||||
|
||||
class { "nova":
|
||||
logdir => $logdir,
|
||||
verbose => $verbose,
|
||||
image_service => $image_service,
|
||||
rabbit_host => $rabbit_host,
|
||||
rabbit_port => $rabbit_port,
|
||||
rabbit_userid => $rabbit_userid,
|
||||
rabbit_virtual_host => $rabbit_virtual_host,
|
||||
sql_connection => "mysql://${db_user}:${db_password}@${db_host}/${db_name}",
|
||||
glance_api_servers => $glance_api_servers,
|
||||
}
|
||||
|
||||
nova::network::bridge { $flat_network_bridge:
|
||||
ip => $flat_network_bridge_ip,
|
||||
netmask => $flat_network_bridge_netmask,
|
||||
}
|
||||
|
||||
class { "nova::compute":
|
||||
api_server => $api_server,
|
||||
enabled => $enabled,
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue