Remove unnessary inheritance
This commit removes any occurrences of the inherits keyword. Ineritance should only be used for overriding resources and accessing params from class defaults. Any other uses are confusing to people who may read this code in the future.
This commit is contained in:
parent
8fe43360fb
commit
6897e43e14
|
@ -1,6 +1,8 @@
|
|||
class nova::api(
|
||||
$enabled=false
|
||||
) inherits nova {
|
||||
) {
|
||||
|
||||
include nova::params
|
||||
|
||||
# TODO what exactly is this for?
|
||||
# This resource is adding a great deal of comlexity to the overall
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
class nova::cert(
|
||||
$enabled=false
|
||||
) inherits nova{
|
||||
) {
|
||||
|
||||
include nova::params
|
||||
|
||||
nova::generic_service { 'cert':
|
||||
enabled => $enabled,
|
||||
|
|
|
@ -1,10 +1,12 @@
|
|||
class nova::compute::libvirt (
|
||||
$libvirt_type = 'kvm',
|
||||
$vncserver_listen = '127.0.0.1'
|
||||
) inherits nova::compute{
|
||||
) {
|
||||
|
||||
include nova::params
|
||||
|
||||
Service['libvirt'] -> Service['nova-compute'] {
|
||||
|
||||
if($::nova::params::compute_package_name) {
|
||||
package { "nova-compute-${libvirt_type}":
|
||||
ensure => present,
|
||||
|
@ -24,10 +26,6 @@ class nova::compute::libvirt (
|
|||
require => Package['libvirt'],
|
||||
}
|
||||
|
||||
Service['nova-compute'] {
|
||||
require +> Service['libvirt'],
|
||||
}
|
||||
|
||||
nova_config { 'libvirt_type': value => $libvirt_type }
|
||||
nova_config { 'connection_type': value => 'libvirt' }
|
||||
nova_config { 'vncserver_listen': value => $vncserver_listen }
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
class nova::compute::multi_host(
|
||||
$enabled = false
|
||||
) inherits nova::compute {
|
||||
) {
|
||||
|
||||
include nova::params
|
||||
|
||||
nova_config { 'enabled_apis': value => 'metadata' }
|
||||
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
class nova::network(
|
||||
$enabled=false
|
||||
) inherits nova {
|
||||
) {
|
||||
|
||||
include nova::params
|
||||
|
||||
nova::generic_service { 'network':
|
||||
enabled => $enabled,
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
class nova::objectstore(
|
||||
$enabled=false
|
||||
) inherits nova {
|
||||
) {
|
||||
|
||||
include nova::params
|
||||
|
||||
nova::generic_service { 'objectstore':
|
||||
enabled => $enabled,
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
class nova::scheduler(
|
||||
$enabled = false
|
||||
) inherits nova {
|
||||
) {
|
||||
|
||||
include nova::params
|
||||
|
||||
nova::generic_service { 'scheduler':
|
||||
enabled => $enabled,
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
class nova::volume(
|
||||
$enabled=false
|
||||
) inherits nova {
|
||||
) {
|
||||
|
||||
include 'nova::params'
|
||||
|
||||
|
|
Loading…
Reference in New Issue