diff --git a/lib/facter/facts.rb b/lib/facter/facts.rb deleted file mode 100644 index ba391a8b..00000000 --- a/lib/facter/facts.rb +++ /dev/null @@ -1,16 +0,0 @@ -Facter.add(:mongodb_version) do - setcode do - commands = ["rpmquery --qf='%{version}-%{release}' mongodb", - "repoquery --qf='%{version}-%{release}' mongodb", - %[LC_ALL=en_US yum -e 0 -d 0 info mongodb | awk '/^Version/ { version=$3; } /^Release/ { print version "-" $3; exit }']] - ret = nil - commands.each do |command| - version = `#{command}`.chomp - if $?.success? && !version.empty? - ret = version - break - end - end - ret - end -end diff --git a/manifests/database.pp b/manifests/database.pp index ed079e21..4323eb41 100644 --- a/manifests/database.pp +++ b/manifests/database.pp @@ -1,15 +1,8 @@ # Set up the pulp database class pulp::database { if $pulp::manage_db { - if (versioncmp($::mongodb_version, '2.6.5') >= 0) { - $mongodb_pidfilepath = '/var/run/mongodb/mongod.pid' - } else { - $mongodb_pidfilepath = '/var/run/mongodb/mongodb.pid' - } - class { '::mongodb::server': - pidfilepath => $mongodb_pidfilepath, - } + include ::mongodb::server Service['mongodb'] -> Service['pulp_celerybeat'] Service['mongodb'] -> Service['pulp_workers']