folsom changes
includes changes to make nova work on folsom: - db char set needs to be latin1 in folsom - nova-novncproxy package needs to be installed - nova-novncproxy is now the vnc proxy service - root_helper replaces with root_wrap_config - don't need deprecated auth anymore. - add compute_driver - make ini provider for parsed config the default
This commit is contained in:
@@ -7,7 +7,6 @@ Puppet::Type.type(:nova_config).provide(
|
||||
:filetype => :flat
|
||||
) do
|
||||
|
||||
confine :osfamily => [:debian]
|
||||
|
||||
#confine :exists => novaconf
|
||||
text_line :comment, :match => /^\s*#/;
|
||||
|
@@ -7,7 +7,8 @@ Puppet::Type.type(:nova_config).provide(
|
||||
:filetype => :flat
|
||||
) do
|
||||
|
||||
confine :osfamily => [:redhat]
|
||||
confine :osfamily => [:debian, :redhat]
|
||||
defaultfor :operatingsystem => :debian
|
||||
|
||||
#confine :exists => novaconf
|
||||
text_line :comment, :match => /#|\[.*/;
|
||||
|
@@ -35,6 +35,8 @@ class nova::compute::libvirt (
|
||||
}
|
||||
}
|
||||
|
||||
nova_config {
|
||||
'compute_driver': value => 'libvirt.LibvirtDriver';
|
||||
'libvirt_type': value => $libvirt_type;
|
||||
'connection_type': value => 'libvirt';
|
||||
'vncserver_listen': value => $vncserver_listen;
|
||||
|
@@ -50,7 +50,9 @@ class nova(
|
||||
$verbose = false,
|
||||
$periodic_interval = '60',
|
||||
$report_interval = '10',
|
||||
$root_helper = $::nova::params::root_helper,
|
||||
$root_wrap_config = '/etc/nova/rootwrap.conf',
|
||||
# deprecated in folsom
|
||||
#$root_helper = $::nova::params::root_helper,
|
||||
$monitoring_notifications = false
|
||||
) inherits nova::params {
|
||||
|
||||
@@ -156,13 +158,6 @@ class nova(
|
||||
|
||||
nova_config { 'auth_strategy': value => $auth_strategy }
|
||||
|
||||
if $auth_strategy == 'keystone' {
|
||||
nova_config { 'use_deprecated_auth': value => false }
|
||||
} else {
|
||||
nova_config { 'use_deprecated_auth': value => true }
|
||||
}
|
||||
|
||||
|
||||
if $rabbit_host {
|
||||
nova_config { 'rabbit_host': value => $rabbit_host }
|
||||
} else {
|
||||
@@ -184,7 +179,7 @@ class nova(
|
||||
'state_path': value => $state_path;
|
||||
'lock_path': value => $lock_path;
|
||||
'service_down_time': value => $service_down_time;
|
||||
'root_helper': value => $root_helper;
|
||||
'root_wrap_config': value => $root_wrap_config;
|
||||
}
|
||||
|
||||
|
||||
|
@@ -46,7 +46,7 @@ class nova::params {
|
||||
$doc_package_name = 'nova-doc'
|
||||
$libvirt_package_name = 'libvirt-bin'
|
||||
$network_package_name = 'nova-network'
|
||||
$vncproxy_package_name = 'novnc'
|
||||
$vncproxy_package_name = ['novnc', 'nova-novncproxy']
|
||||
$numpy_package_name = 'python-numpy'
|
||||
$objectstore_package_name = 'nova-objectstore'
|
||||
$scheduler_package_name = 'nova-scheduler'
|
||||
@@ -59,7 +59,7 @@ class nova::params {
|
||||
$consoleauth_service_name = 'nova-consoleauth'
|
||||
$libvirt_service_name = 'libvirt-bin'
|
||||
$network_service_name = 'nova-network'
|
||||
$vncproxy_service_name = 'novnc'
|
||||
$vncproxy_service_name = 'nova-novncproxy'
|
||||
$objectstore_service_name = 'nova-objectstore'
|
||||
$scheduler_service_name = 'nova-scheduler'
|
||||
$volume_service_name = 'nova-volume'
|
||||
@@ -67,7 +67,7 @@ class nova::params {
|
||||
# debian specific nova config
|
||||
$root_helper = 'sudo nova-rootwrap'
|
||||
$lock_path = '/var/lock/nova'
|
||||
$nova_db_charset = 'utf8'
|
||||
$nova_db_charset = 'latin1'
|
||||
case $::operatingsystem {
|
||||
'Debian': {
|
||||
$consoleauth_package_name = 'nova-console'
|
||||
|
Reference in New Issue
Block a user