Merge branch 'release/0.3.1'

CHANGELOG

@@ -1,4 +1,8 @@
-* Sat Jul 10 2017 Dylan Cochran <[email protected]> - 0.3.0
+* Mon Jul 10 2017 Dylan Cochran <[email protected]> - 0.3.1
+- (SIMP-3360) Use module data for certificate paths
+- (SIMP-3087) Add libkv::lookup hierav5 backend function
+
+* Mon Jul 10 2017 Dylan Cochran <[email protected]> - 0.3.0
 - (SIMP-2961) Add automatic cluster creation for consul.
 - (SIMP-3130) metadata needs to default to 'String'.
 - (SIMP-3129) atomic_create needs to create metadata

data/common.yaml

@@ -1,6 +1,7 @@
 lookup_options:
   libkv::consul::config_hash:
     merge: hash
+libkv::consul::puppet_cert_path: '/etc/puppetlabs/puppet/ssl'
 libkv::consul::config_hash:
   acl_datacenter: "dc1"
   acl_default_policy: "deny"

data/kernel/FreeBSD.yaml

@@ -0,0 +1 @@
+libkv::consul::puppet_cert_path: '/var/puppet/ssl'

functions/lookup.pp

@@ -0,0 +1,37 @@
+function libkv::lookup(
+	Variant[String, Numeric] $key,
+	Hash $options,
+	Puppet::LookupContext $context,
+) {
+	case $key {
+		"lookup_options": {
+			$context.not_found
+		}
+		"libkv::auth": {
+			$context.not_found
+		}
+		"libkv::url": {
+			$context.not_found
+		}
+		default: {
+			if ($options["uri"] == undef) {
+				$_key = "/${key}"
+				$_url = undef
+			} else {
+				if ($options["uri"] =~ /.*:\/\/.*\/.*/) {
+					$_key = "/${key}"
+					$_url = $options["uri"]
+				} else {
+					$_key = "${uri}/${key}"
+					$_url = undef
+				}
+
+			}
+			if (libkv::exists({ "url" => $_url, "key" => $_key})) {
+				libkv::get({ "url"      => $_url, "key" =>  $_key})
+			} else {
+				$context.not_found
+			}
+		}
+	}
+}

hiera.yaml

@@ -5,6 +5,9 @@ hierarchy:
   - name: "OSFamily + Release"
     backend: "yaml"
     path: "os/%{facts.osfamily}-%{facts.operatingsystemmajrelease}"
+  - name: "Kernel"
+    backend: "yaml"
+    path: "kernel/%{facts.kernel}"
   - name: "Common"
     backend: "yaml"
     path: "common"

lib/puppet_x/libkv/libkv.rb

@@ -105,7 +105,7 @@ def sanitize_input(symbol, params)
           unless (params[name].class.to_s == "String")
             raise "parameter #{name} should be String, found #{params[name].class.to_s}"
           end
-          regex = /^\/[a-zA-Z0-9._\-\/]*$/
+          regex = /^\/[a-zA-Z0-9._:\-\/]*$/
           error_msg = "the value of '#{name}': '#{params[name]}' does not match regex '#{regex}'"
           unless (regex =~ params[name])
             raise error_msg

manifests/consul.pp

@@ -12,6 +12,7 @@
   $serverhost = undef,
   $advertise = undef,
   $datacenter = undef,
+  $puppet_cert_path,
   $ca_file_name = undef,
   $private_file_name = undef,
   $cert_file_name = undef,
@@ -142,9 +143,9 @@
         }
       }
     } else {
-      $_cert_file_name_source = "/etc/puppetlabs/puppet/ssl/certs/${::clientcert}.pem"
-      $_ca_file_name_source = '/etc/puppetlabs/puppet/ssl/certs/ca.pem'
-      $_private_file_name_source = "/etc/puppetlabs/puppet/ssl/private_keys/${::clientcert}.pem"
+      $_cert_file_name_source = "${puppet_cert_path}/certs/${::clientcert}.pem"
+      $_ca_file_name_source = "${puppet_cert_path}/certs/ca.pem"
+      $_private_file_name_source = "${puppet_cert_path}/private_keys/${::clientcert}.pem"
       file { '/etc/simp/consul/cert.pem':
         source => $_cert_file_name_source
       }

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "simp-libkv",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "author": "simp",
   "summary": "",
   "license": "Apache-2.0",