Fix some puppet lint warnings.
Puppet-lint likes the ensure's to come first. Change-Id: I127ee497d01c7a466338a334a61b47d862d79097
This commit is contained in:
parent
84303ef81c
commit
8f77b5f11c
|
@ -116,14 +116,14 @@ class nova::api(
|
||||||
}
|
}
|
||||||
if !defined(Package['pyssf']) {
|
if !defined(Package['pyssf']) {
|
||||||
package { 'pyssf':
|
package { 'pyssf':
|
||||||
provider => pip,
|
|
||||||
ensure => latest,
|
ensure => latest,
|
||||||
|
provider => pip,
|
||||||
require => Package['python-pip']
|
require => Package['python-pip']
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
package { 'openstackocci':
|
package { 'openstackocci':
|
||||||
provider => 'pip',
|
|
||||||
ensure => latest,
|
ensure => latest,
|
||||||
|
provider => 'pip',
|
||||||
require => Package['python-pip'],
|
require => Package['python-pip'],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,13 +35,13 @@ class nova::compute::libvirt (
|
||||||
}
|
}
|
||||||
|
|
||||||
package { 'libvirt':
|
package { 'libvirt':
|
||||||
name => $::nova::params::libvirt_package_name,
|
|
||||||
ensure => present,
|
ensure => present,
|
||||||
|
name => $::nova::params::libvirt_package_name,
|
||||||
}
|
}
|
||||||
|
|
||||||
service { 'libvirt' :
|
service { 'libvirt' :
|
||||||
name => $::nova::params::libvirt_service_name,
|
|
||||||
ensure => running,
|
ensure => running,
|
||||||
|
name => $::nova::params::libvirt_service_name,
|
||||||
provider => $::nova::params::special_service_provider,
|
provider => $::nova::params::special_service_provider,
|
||||||
require => Package['libvirt'],
|
require => Package['libvirt'],
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,16 +38,16 @@ define nova::generic_service(
|
||||||
# installed before nova_config
|
# installed before nova_config
|
||||||
if ($package_name) {
|
if ($package_name) {
|
||||||
package { $nova_title:
|
package { $nova_title:
|
||||||
name => $package_name,
|
|
||||||
ensure => $ensure_package,
|
ensure => $ensure_package,
|
||||||
|
name => $package_name,
|
||||||
notify => Service[$nova_title],
|
notify => Service[$nova_title],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($service_name) {
|
if ($service_name) {
|
||||||
service { $nova_title:
|
service { $nova_title:
|
||||||
name => $service_name,
|
|
||||||
ensure => $service_ensure,
|
ensure => $service_ensure,
|
||||||
|
name => $service_name,
|
||||||
enable => $enabled,
|
enable => $enabled,
|
||||||
hasstatus => true,
|
hasstatus => true,
|
||||||
require => [Package['nova-common'], Package[$nova_title]],
|
require => [Package['nova-common'], Package[$nova_title]],
|
||||||
|
|
|
@ -111,8 +111,8 @@ class nova(
|
||||||
}
|
}
|
||||||
|
|
||||||
package { 'nova-common':
|
package { 'nova-common':
|
||||||
name => $::nova::params::common_package_name,
|
|
||||||
ensure => $ensure_package,
|
ensure => $ensure_package,
|
||||||
|
name => $::nova::params::common_package_name,
|
||||||
require => [Package['python-nova'], Anchor['nova-start']]
|
require => [Package['python-nova'], Anchor['nova-start']]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -21,8 +21,8 @@ class nova::vncproxy(
|
||||||
|
|
||||||
if ! defined(Package['python-numpy']) {
|
if ! defined(Package['python-numpy']) {
|
||||||
package { 'python-numpy':
|
package { 'python-numpy':
|
||||||
name => $::nova::params::numpy_package_name,
|
|
||||||
ensure => present,
|
ensure => present,
|
||||||
|
name => $::nova::params::numpy_package_name,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
nova::generic_service { 'vncproxy':
|
nova::generic_service { 'vncproxy':
|
||||||
|
|
|
@ -35,13 +35,13 @@ class nova::volume::iscsi (
|
||||||
case $iscsi_helper {
|
case $iscsi_helper {
|
||||||
'tgtadm': {
|
'tgtadm': {
|
||||||
package { 'tgt':
|
package { 'tgt':
|
||||||
name => $::nova::params::tgt_package_name,
|
|
||||||
ensure => present,
|
ensure => present,
|
||||||
|
name => $::nova::params::tgt_package_name,
|
||||||
}
|
}
|
||||||
service { 'tgtd':
|
service { 'tgtd':
|
||||||
|
ensure => running,
|
||||||
name => $::nova::params::tgt_service_name,
|
name => $::nova::params::tgt_service_name,
|
||||||
provider => $::nova::params::special_service_provider,
|
provider => $::nova::params::special_service_provider,
|
||||||
ensure => running,
|
|
||||||
enable => true,
|
enable => true,
|
||||||
require => [Nova::Generic_service['volume'], Package['tgt']],
|
require => [Nova::Generic_service['volume'], Package['tgt']],
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue