Disable nova-compute start after package installation

APT tool immediatelly starts nova-compute service after package
installation, service records itself in OpenStack database and then
restarts with modified 'host' configuration value.  First record with
default 'host' value is not removed this leads to failed OSTF tests that
check services states.

Remove useless 'if' statement, because its true branch never gets
executed due to misspelled fact '$::operaringsystem'.

While here more puppet style guide conformance (no functional change):
- 'ensure' goes first in resource attribute list
-  properly align hash arrows

Change-Id: I7124675887f7a75487b0f077ee4599bb25bae6bc
Closes-bug: #1475346
This commit is contained in:
Igor Zinovik 2015-07-23 16:52:59 +03:00
parent 38a188ebf4
commit 0250b92ee6

View File

@ -57,16 +57,14 @@ class vmware::controller (
}
}
if ($::operaringsystem == 'Ubuntu') {
$libvirt_type = hiera('libvirt_type')
$compute_package_name = "nova-compute-${libvirt_type}"
} else {
$compute_package_name = $::nova::params::compute_package_name
$libvirt_type = hiera('libvirt_type')
tweaks::ubuntu_service_override { 'nova-compute':
package_name => "nova-compute-${libvirt_type}",
}
package { 'nova-compute':
ensure => 'present',
name => $compute_package_name,
name => $::nova::params::compute_package_name,
}
service { 'nova-compute':