Merge branch 'release/0.4.1'

simp · Jul 18, 2017 · bcc3ba6 · bcc3ba6
2 parents 4a7369f + c829025
commit bcc3ba6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+* Tue Jul 18 2017 Dylan Cochran <[email protected]> - 0.4.1
+- Always copy over consul-acl, and update metadata
+
 * Tue Jul 18 2017 Dylan Cochran <[email protected]> - 0.4.0
 - (SIMP-3275) libkv auto-config uses the root acl
 

diff --git a/manifests/consul.pp b/manifests/consul.pp
@@ -36,6 +36,14 @@
     }
   }
   package { "unzip": }
+  file { "/usr/bin/consul-acl":
+    mode   => "a+x",
+    source => "puppet:///modules/libkv/consul/consul-acl"
+  }
+  file { "/usr/bin/consul-create-acl":
+    mode   => "a+x",
+    source => "puppet:///modules/libkv/consul/consul-create-acl"
+  }
   if ($bootstrap == true) {
     $_bootstrap_hash = { "bootstrap_expect" => 1 }
   } else {
@@ -44,26 +52,18 @@
     if ($facts["consul_bootstrap"] == "true") {
       $_bootstrap_hash = { "bootstrap_expect" => 1 }
       ## Create real token
-      file { "/usr/bin/consul-acl":
-        mode   => "a+x",
-        source => "puppet:///modules/libkv/consul/consul-acl"
-      } ->
-      file { "/usr/bin/consul-create-acl":
-        mode   => "a+x",
-        source => "puppet:///modules/libkv/consul/consul-create-acl"
-      } ->
       exec { "/usr/bin/consul-create-acl -t libkv /etc/simp/bootstrap/consul/master_token /etc/simp/bootstrap/consul/libkv_token":
         creates => "/etc/simp/bootstrap/consul/libkv_token",
         require => [
           Service['consul'],
-          File["/usr/bin/consul-create-acl"],
+          File["/usr/bin/consul-acl"],
         ],
       }
       exec { "/usr/bin/consul-create-acl -t agent_token /etc/simp/bootstrap/consul/master_token /etc/simp/bootstrap/consul/agent_token":
         creates => "/etc/simp/bootstrap/consul/agent_token",
         require => [
           Service['consul'],
-          File["/usr/bin/consul-create-acl"],
+          File["/usr/bin/consul-acl"],
         ],
       }
     } else {

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "simp-libkv",
-  "version": "0.3.3",
+  "version": "0.4.1",
   "author": "simp",
   "summary": "",
   "license": "Apache-2.0",