Fix resources for latest puppet
Running the unit tests under the latest puppet fails because of undefined resources. This change updates the references to use collectors if they are optional or change the definitions in the files for resources that are defined in the existing class. Change-Id: I5506a563c459baf9d34246a1d517e07a82e0f36b Closes-Bug: #1702964
This commit is contained in:
parent
ca1bdcfd7b
commit
08661e0fef
|
@ -65,7 +65,7 @@ class nova::compute::libvirt::services (
|
|||
enable => true,
|
||||
name => $libvirt_service_name,
|
||||
provider => $::nova::params::special_service_provider,
|
||||
require => Package['libvirt'],
|
||||
require => Anchor['nova::install::end'],
|
||||
}
|
||||
|
||||
# messagebus
|
||||
|
|
|
@ -230,11 +230,11 @@ class nova::metadata::novajoin::api (
|
|||
command => "/usr/bin/kinit -kt /etc/krb5.keytab && ipa-getkeytab -s `grep xmlrpc_uri /etc/ipa/default.conf | cut -d/ -f3` \
|
||||
-p nova/${::fqdn} -k ${keytab}",
|
||||
creates => $keytab,
|
||||
require => Package['python-novajoin']
|
||||
}
|
||||
|
||||
ensure_resource('file', $keytab, { owner => $service_user, require => Exec['get-service-user-keytab'] })
|
||||
|
||||
Package<| tag == 'novajoin-package' |> -> Exec['get-service-user-keytab']
|
||||
Novajoin_config<||> ~> Service<| title == 'novajoin-server'|>
|
||||
Novajoin_config<||> ~> Service<| title == 'novajoin-notify'|>
|
||||
Exec['get-service-user-keytab'] ~> Service['novajoin-server']
|
||||
|
|
Loading…
Reference in New Issue