openstack/puppet-trove
Code Issues Proposed changes

Change to relative include

Browse Source 
Change-Id: I8c10ceaaeea23e711804d5fef55474a1474da3a8
This commit is contained in:
Tobias Urdin 2020-07-13 21:24:44 +02:00
parent 3fc1d51754
commit 05a2bd8514
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/client.pp
View File

@ -43,6 +43,6 @@ class trove::client (
tag => 'openstack', tag => 'openstack',
} }
include '::openstacklib::openstackclient' include openstacklib::openstackclient
} }

4
manifests/conductor.pp
View File

@ -80,8 +80,8 @@ class trove::conductor(
if $::trove::database_connection { if $::trove::database_connection {
if($::trove::database_connection =~ /mysql:\/\/\S+:\S+@\S+\/\S+/) { if($::trove::database_connection =~ /mysql:\/\/\S+:\S+@\S+\/\S+/) {
require '::mysql::bindings' require mysql::bindings
require '::mysql::bindings::python' require mysql::bindings::python
} elsif($::trove::database_connection =~ /postgresql:\/\/\S+:\S+@\S+\/\S+/) { } elsif($::trove::database_connection =~ /postgresql:\/\/\S+:\S+@\S+\/\S+/) {
} elsif($::trove::database_connection =~ /sqlite:\/\//) { } elsif($::trove::database_connection =~ /sqlite:\/\//) {

6
manifests/taskmanager.pp
View File

@ -121,8 +121,8 @@ the future release. Please use trove::default_neutron_networks instead.")
if $::trove::database_connection { if $::trove::database_connection {
if($::trove::database_connection =~ /mysql:\/\/\S+:\S+@\S+\/\S+/) { if($::trove::database_connection =~ /mysql:\/\/\S+:\S+@\S+\/\S+/) {
require '::mysql::bindings' require mysql::bindings
require '::mysql::bindings::python' require mysql::bindings::python
} elsif($::trove::database_connection =~ /postgresql:\/\/\S+:\S+@\S+\/\S+/) { } elsif($::trove::database_connection =~ /postgresql:\/\/\S+:\S+@\S+\/\S+/) {
} elsif($::trove::database_connection =~ /sqlite:\/\//) { } 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'], require => Anchor['trove::install::end'],
} }
} else { } else {
class {'::trove::guestagent': class {'trove::guestagent':
enabled => false, enabled => false,
manage_service => false, manage_service => false,
} }