Make package 'bridge-utils' usage safe

When using puppet-nova with another big Puppet modules
this package may be defined before.

The solution is to make a definition safe.

Upstream-bug:  https://bugs.launchpad.net/puppet-nova/+bug/1445437

Fuel-CI: disable
Related-bug: #1440681
Change-Id: Ie1dc7c9d6b2b05802b38974d6303b41f035676ab
This commit is contained in:
Sergey Vasilenko 2015-04-17 14:01:00 +03:00
parent 10345eca7e
commit 91ee597bb2
1 changed files with 3 additions and 4 deletions

View File

@ -99,6 +99,7 @@ class nova::compute (
) {
include nova::params
include stdlib
if ($vnc_enabled) {
if ($vncproxy_host) {
@ -117,10 +118,8 @@ class nova::compute (
if $neutron_enabled != true {
# Install bridge-utils if we use nova-network
package { 'bridge-utils':
ensure => present,
before => Nova::Generic_service['compute'],
}
ensure_packages('bridge-utils')
Package <| title == 'bridge-utils' |> -> Nova::Generic_service['compute']
}
nova::generic_service { 'compute':