From 3e63ce3c71620433dc135959b2743aa010b28fe1 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 17 May 2016 12:52:57 +0200 Subject: update submodules so "rake test" doesnt complain anymore --- puppet/modules/couchdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet/modules/couchdb/lib/facter/couchdb_version.rb') diff --git a/puppet/modules/couchdb b/puppet/modules/couchdb index 40d2289f..76ff149a 160000 --- a/puppet/modules/couchdb +++ b/puppet/modules/couchdb @@ -1 +1 @@ -Subproject commit 40d2289f8e10625cd45fdccdf492b5fb6490e66d +Subproject commit 76ff149a095023611c05bbb00157d06f87b07c05 -- cgit v1.2.3 From 7ce3190986cf8e5fe037a7ccd4c1076505b117f4 Mon Sep 17 00:00:00 2001 From: Micah Date: Tue, 12 Jul 2016 16:41:59 -0400 Subject: remove submodules in preparation for move to subrepos Change-Id: Ia7655153b556337f676e3d909559c4a7306bedd6 --- puppet/modules/couchdb | 1 - 1 file changed, 1 deletion(-) delete mode 160000 puppet/modules/couchdb (limited to 'puppet/modules/couchdb/lib/facter/couchdb_version.rb') diff --git a/puppet/modules/couchdb b/puppet/modules/couchdb deleted file mode 160000 index 76ff149a..00000000 --- a/puppet/modules/couchdb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 76ff149a095023611c05bbb00157d06f87b07c05 -- cgit v1.2.3 From f2019755fd724fb1020cb2d97cdf82b751450ebc Mon Sep 17 00:00:00 2001 From: Micah Date: Tue, 12 Jul 2016 16:45:54 -0400 Subject: git subrepo clone https://leap.se/git/puppet_couchdb puppet/modules/couchdb subrepo: subdir: "puppet/modules/couchdb" merged: "76ff149" upstream: origin: "https://leap.se/git/puppet_couchdb" branch: "master" commit: "76ff149" git-subrepo: version: "0.3.0" origin: "https://github.com/ingydotnet/git-subrepo" commit: "1e79595" Change-Id: I9ccb1a9dfdaa083814ea395132c42a778052f59b --- .../modules/couchdb/lib/facter/couchdb_version.rb | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 puppet/modules/couchdb/lib/facter/couchdb_version.rb (limited to 'puppet/modules/couchdb/lib/facter/couchdb_version.rb') diff --git a/puppet/modules/couchdb/lib/facter/couchdb_version.rb b/puppet/modules/couchdb/lib/facter/couchdb_version.rb new file mode 100644 index 00000000..3a721169 --- /dev/null +++ b/puppet/modules/couchdb/lib/facter/couchdb_version.rb @@ -0,0 +1,34 @@ +require 'facter' + +def deb_installed_version ( name ) + # returns an empty string if package is not installed, + # otherwise the version + + version = `apt-cache policy #{name} | grep Installed 2>&1` + version.slice! " Installed: " + version.slice! "(none)" + return version.strip.chomp +end + +def couchdb_version + bigcouch = deb_installed_version("bigcouch") + if bigcouch.empty? + couchdb = deb_installed_version("couchdb") + if couchdb.empty? + version = 'n/a' + else + version = couchdb + end + else + # bigcouch is currently only available in one version (0.4.2), + # which includes couchdb 1.1.1 + version = '1.1.1' + end + return version +end + +Facter.add(:couchdb_version) do + setcode do + couchdb_version + end +end -- cgit v1.2.3