Use relative name for class inclusion
This patch replces the remaining usage of absolute name in 'require', and makes all class inclusion depend on relative name. Change-Id: Id4e75f6fcff47170ea624c1b5943086ceac5a678
This commit is contained in:
parent
b4d9555e1d
commit
5df142a1a9
|
@ -18,7 +18,7 @@ class nova::compute::ironic (
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include nova::deps
|
include nova::deps
|
||||||
require ::nova::ironic::common
|
require nova::ironic::common
|
||||||
include ironic::client
|
include ironic::client
|
||||||
|
|
||||||
nova_config {
|
nova_config {
|
||||||
|
|
|
@ -55,7 +55,7 @@ class nova::compute::libvirt::qemu(
|
||||||
) inherits nova::compute::libvirt::version {
|
) inherits nova::compute::libvirt::version {
|
||||||
|
|
||||||
include nova::deps
|
include nova::deps
|
||||||
require ::nova::compute::libvirt
|
require nova::compute::libvirt
|
||||||
|
|
||||||
Anchor['nova::config::begin']
|
Anchor['nova::config::begin']
|
||||||
-> Augeas<| tag == 'qemu-conf-augeas'|>
|
-> Augeas<| tag == 'qemu-conf-augeas'|>
|
||||||
|
|
|
@ -47,7 +47,7 @@ class nova::compute::libvirt::virtlogd (
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include nova::deps
|
include nova::deps
|
||||||
require ::nova::compute::libvirt
|
require nova::compute::libvirt
|
||||||
|
|
||||||
if $log_level {
|
if $log_level {
|
||||||
virtlogd_config {
|
virtlogd_config {
|
||||||
|
|
|
@ -178,7 +178,7 @@ Use password parameter instead')
|
||||||
}
|
}
|
||||||
|
|
||||||
if $enable_ipa_client_install {
|
if $enable_ipa_client_install {
|
||||||
require ::ipaclient
|
require ipaclient
|
||||||
# If we're installing IPA here, the hostname fact won't be populated yet,
|
# If we're installing IPA here, the hostname fact won't be populated yet,
|
||||||
# so we'll use a command to get it.
|
# so we'll use a command to get it.
|
||||||
$ipa_hostname_real = '`grep xmlrpc_uri /etc/ipa/default.conf | cut -d/ -f3`'
|
$ipa_hostname_real = '`grep xmlrpc_uri /etc/ipa/default.conf | cut -d/ -f3`'
|
||||||
|
|
Loading…
Reference in New Issue