4905dce9a8
Previously, the vnc package was installing novnc from source b/c the packages were not working correctly on Ubuntu. This commit removes the code that was installing from source and adds code to ensure that the correct vncproxy package is installed correctly on Ubuntu Precise.
88 lines
3.5 KiB
Puppet
88 lines
3.5 KiB
Puppet
# these parameters need to be accessed from several locations and
|
|
# should be considered to be constant
|
|
class nova::params {
|
|
|
|
case $::osfamily {
|
|
'RedHat': {
|
|
# package names
|
|
$api_package_name = false
|
|
$cert_package_name = false
|
|
$common_package_name = 'openstack-nova'
|
|
$compute_package_name = false
|
|
$consoleauth_package_name = false
|
|
$doc_package_name = 'openstack-nova-doc'
|
|
$libvirt_package_name = 'libvirt'
|
|
$network_package_name = false
|
|
$numpy_package_name = 'numpy'
|
|
$objectstore_package_name = false
|
|
$scheduler_package_name = false
|
|
$tgt_package_name = 'scsi-target-utils'
|
|
$volume_package_name = false
|
|
$vncproxy_package_name = false
|
|
# service names
|
|
$api_service_name = 'openstack-nova-api'
|
|
$cert_service_name = 'openstack-nova-cert'
|
|
$compute_service_name = 'openstack-nova-compute'
|
|
$consoleauth_service_name = 'openstack-nova-consoleauth'
|
|
$libvirt_service_name = 'libvirtd'
|
|
$network_service_name = 'openstack-nova-network'
|
|
$objectstore_service_name = 'openstack-nova-objectstore'
|
|
$scheduler_service_name = 'openstack-nova-scheduler'
|
|
$tgt_service_name = 'tgtd'
|
|
$vncproxy_service_name = false
|
|
$volume_service_name = 'openstack-nova-volume'
|
|
$special_service_provider = 'init'
|
|
# redhat specific config defaults
|
|
$root_helper = 'sudo nova-rootwrap'
|
|
$lock_path = '/var/lib/nova/tmp'
|
|
}
|
|
'Debian': {
|
|
# package names
|
|
$api_package_name = 'nova-api'
|
|
$cert_package_name = 'nova-cert'
|
|
$common_package_name = 'nova-common'
|
|
$compute_package_name = 'nova-compute'
|
|
$doc_package_name = 'nova-doc'
|
|
$libvirt_package_name = 'libvirt-bin'
|
|
$network_package_name = 'nova-network'
|
|
$vncproxy_package_name = 'novnc'
|
|
$numpy_package_name = 'python-numpy'
|
|
$objectstore_package_name = 'nova-objectstore'
|
|
$scheduler_package_name = 'nova-scheduler'
|
|
$tgt_package_name = 'tgt'
|
|
$volume_package_name = 'nova-volume'
|
|
# service names
|
|
$api_service_name = 'nova-api'
|
|
$cert_service_name = 'nova-cert'
|
|
$compute_service_name = 'nova-compute'
|
|
$consoleauth_service_name = 'nova-consoleauth'
|
|
$libvirt_service_name = 'libvirt-bin'
|
|
$network_service_name = 'nova-network'
|
|
$vncproxy_service_name = 'novnc'
|
|
$objectstore_service_name = 'nova-objectstore'
|
|
$scheduler_service_name = 'nova-scheduler'
|
|
$volume_service_name = 'nova-volume'
|
|
$tgt_service_name = 'tgt'
|
|
# debian specific nova config
|
|
$root_helper = 'sudo nova-rootwrap'
|
|
$lock_path = '/var/lock/nova'
|
|
case $::operatingsystem {
|
|
'Debian': {
|
|
$consoleauth_package_name = 'nova-console'
|
|
# Use default provider on Debian
|
|
$special_service_provider = undef
|
|
}
|
|
default: {
|
|
$consoleauth_package_name = 'nova-consoleauth'
|
|
# some of the services need to be started form the special upstart provider
|
|
$special_service_provider = 'upstart'
|
|
}
|
|
}
|
|
}
|
|
default: {
|
|
fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily RedHat and Debian")
|
|
}
|
|
}
|
|
|
|
}
|