From 05a2bd8514c9ac5ff9aded5234968dcea0f9a276 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Mon, 13 Jul 2020 21:24:44 +0200 Subject: [PATCH] Change to relative include Change-Id: I8c10ceaaeea23e711804d5fef55474a1474da3a8 --- manifests/client.pp | 2 +- manifests/conductor.pp | 4 ++-- manifests/taskmanager.pp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/manifests/client.pp b/manifests/client.pp index 1a4fbc87..767280a7 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -43,6 +43,6 @@ class trove::client ( tag => 'openstack', } - include '::openstacklib::openstackclient' + include openstacklib::openstackclient } diff --git a/manifests/conductor.pp b/manifests/conductor.pp index aba8d2b1..0dc2ec0c 100644 --- a/manifests/conductor.pp +++ b/manifests/conductor.pp @@ -80,8 +80,8 @@ class trove::conductor( if $::trove::database_connection { if($::trove::database_connection =~ /mysql:\/\/\S+:\S+@\S+\/\S+/) { - require '::mysql::bindings' - require '::mysql::bindings::python' + require mysql::bindings + require mysql::bindings::python } elsif($::trove::database_connection =~ /postgresql:\/\/\S+:\S+@\S+\/\S+/) { } elsif($::trove::database_connection =~ /sqlite:\/\//) { diff --git a/manifests/taskmanager.pp b/manifests/taskmanager.pp index a8b5c766..792d3921 100644 --- a/manifests/taskmanager.pp +++ b/manifests/taskmanager.pp @@ -121,8 +121,8 @@ the future release. Please use trove::default_neutron_networks instead.") if $::trove::database_connection { if($::trove::database_connection =~ /mysql:\/\/\S+:\S+@\S+\/\S+/) { - require '::mysql::bindings' - require '::mysql::bindings::python' + require mysql::bindings + require mysql::bindings::python } elsif($::trove::database_connection =~ /postgresql:\/\/\S+:\S+@\S+\/\S+/) { } elsif($::trove::database_connection =~ /sqlite:\/\//) { @@ -257,7 +257,7 @@ Please configure options directly with the trove::guestagent class using hiera." require => Anchor['trove::install::end'], } } else { - class {'::trove::guestagent': + class {'trove::guestagent': enabled => false, manage_service => false, }