26a3eea54e
Previously, nova did not support forcing config_drive and users would need to specify the config-drive=true nova CLI option. However, Horizon G release is unable spawn instances using the config-drive=true CLI option. This change provides the ability for users to fully leverage config_drive for Nova deployments. More information on Config Drive can be found here: http://http://docs.openstack.org/trunk/openstack-compute/admin/content/config-drive.html The change implements a new force_config_drive parameter. The parameter is set to false to maintain backwards compatability. Change-Id: Ic2fc7c74134a041cba35b6fcd19b0716f7dc7a0e
58 lines
1.8 KiB
Puppet
58 lines
1.8 KiB
Puppet
#schedulee this class should probably never be declared except
|
|
# from the virtualization implementation of the compute node
|
|
class nova::compute (
|
|
$enabled = false,
|
|
$ensure_package = 'present',
|
|
$vnc_enabled = true,
|
|
$vncserver_proxyclient_address = '127.0.0.1',
|
|
$vncproxy_host = false,
|
|
$vncproxy_protocol = 'http',
|
|
$vncproxy_port = '6080',
|
|
$vncproxy_path = '/vnc_auto.html',
|
|
$force_config_drive = false,
|
|
$virtio_nic = false
|
|
) {
|
|
|
|
include nova::params
|
|
|
|
if ($vnc_enabled) {
|
|
if ($vncproxy_host) {
|
|
$vncproxy_base_url = "${vncproxy_protocol}://${vncproxy_host}:${vncproxy_port}${vncproxy_path}"
|
|
# config for vnc proxy
|
|
nova_config {
|
|
'DEFAULT/novncproxy_base_url': value => $vncproxy_base_url;
|
|
}
|
|
}
|
|
}
|
|
|
|
nova_config {
|
|
'DEFAULT/vnc_enabled': value => $vnc_enabled;
|
|
'DEFAULT/vncserver_proxyclient_address': value => $vncserver_proxyclient_address;
|
|
}
|
|
|
|
package { 'bridge-utils':
|
|
ensure => present,
|
|
before => Nova::Generic_service['compute'],
|
|
}
|
|
|
|
nova::generic_service { 'compute':
|
|
enabled => $enabled,
|
|
package_name => $::nova::params::compute_package_name,
|
|
service_name => $::nova::params::compute_service_name,
|
|
ensure_package => $ensure_package,
|
|
before => Exec['networking-refresh']
|
|
}
|
|
|
|
if $force_config_drive {
|
|
nova_config { 'DEFAULT/force_config_drive': value => true }
|
|
} else {
|
|
nova_config { 'DEFAULT/force_config_drive': ensure => absent }
|
|
}
|
|
|
|
if $virtio_nic {
|
|
# Enable the virtio network card for instances
|
|
nova_config { 'DEFAULT/libvirt_use_virtio_for_bridges': value => true }
|
|
}
|
|
|
|
}
|