From 13ba81c7593e9b16a0f5b6af28cd8d02b0ddbace Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 15 Feb 2017 10:02:15 +0100
Subject: git subrepo pull files/puppet/modules/pixelated

subrepo:
  subdir:   "files/puppet/modules/pixelated"
  merged:   "dbd51d7"
upstream:
  origin:   "https://github.com/pixelated/puppet-pixelated.git"
  branch:   "master"
  commit:   "dbd51d7"
git-subrepo:
  version:  "0.3.0"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "841aa43"
---
 files/puppet/modules/pixelated/.gitrepo           |  4 +--
 files/puppet/modules/pixelated/Gemfile.lock       | 44 ++++++++++++++++-------
 files/puppet/modules/pixelated/files/leap_test.rb |  3 +-
 3 files changed, 34 insertions(+), 17 deletions(-)

(limited to 'files')

diff --git a/files/puppet/modules/pixelated/.gitrepo b/files/puppet/modules/pixelated/.gitrepo
index 0aa282f..f84ebce 100644
--- a/files/puppet/modules/pixelated/.gitrepo
+++ b/files/puppet/modules/pixelated/.gitrepo
@@ -6,6 +6,6 @@
 [subrepo]
 	remote = https://github.com/pixelated/puppet-pixelated.git
 	branch = master
-	commit = e2d73ed113120d6e9900a285bb1e5bc7a1968101
-	parent = f3eafa18540e84eb1673df6ff316ce453eb86429
+	commit = dbd51d768ce3898bdb8b32b83aaabaf3b4e190b7
+	parent = daf1749348e2aa4d6dcd05d8bca9bfc517ced9c7
 	cmdver = 0.3.0
diff --git a/files/puppet/modules/pixelated/Gemfile.lock b/files/puppet/modules/pixelated/Gemfile.lock
index 44ff38d..b49c145 100644
--- a/files/puppet/modules/pixelated/Gemfile.lock
+++ b/files/puppet/modules/pixelated/Gemfile.lock
@@ -2,36 +2,46 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (2.2.8)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     facter (2.4.6)
       CFPropertyList (~> 2.2.6)
-    facterdb (0.3.7)
+    facterdb (0.3.9)
       facter
       jgrep
+    fast_gettext (1.1.0)
+    gettext (3.2.2)
+      locale (>= 2.0.5)
+      text (>= 1.3.0)
+    gettext-setup (0.13)
+      fast_gettext (~> 1.1.0)
+      gettext (>= 3.0.2)
+      locale
     hiera (1.3.4)
       json_pure
     jgrep (1.4.1)
       json
-    json (2.0.2)
-    json_pure (2.0.2)
-    mcollective-client (2.9.0)
+    json (2.0.3)
+    json_pure (2.0.3)
+    locale (2.1.2)
+    mcollective-client (2.9.1)
       json
       stomp
       systemu
     metaclass (0.0.4)
-    metadata-json-lint (0.0.11)
+    metadata-json-lint (1.0.0)
       json
+      semantic_puppet (>= 0.1.2, < 2.0.0)
       spdx-licenses (~> 1.0)
-    mocha (1.2.0)
+    mocha (1.2.1)
       metaclass (~> 0.0.1)
     puppet (3.8.7)
       facter (> 1.6, < 3)
       hiera (~> 1.0)
       json_pure
-    puppet-lint (2.0.2)
-    puppet-syntax (2.1.0)
+    puppet-lint (2.1.1)
+    puppet-syntax (2.3.0)
       rake
-    puppetlabs_spec_helper (1.2.2)
+    puppetlabs_spec_helper (2.0.1)
       mocha (~> 1.0)
       puppet-lint (~> 2.0)
       puppet-syntax (~> 2.0)
@@ -48,20 +58,28 @@ GEM
       rspec-support (~> 3.1.0)
     rspec-mocks (3.1.3)
       rspec-support (~> 3.1.0)
-    rspec-puppet (2.4.0)
+    rspec-puppet (2.5.0)
       rspec
-    rspec-puppet-facts (1.7.0)
+    rspec-puppet-facts (1.7.1)
       facter
       facterdb (>= 0.3.0)
       json
       mcollective-client
       puppet
-    rspec-puppet-utils (2.2.1)
+    rspec-puppet-utils (3.1.0)
+      mocha
+      puppet (>= 3)
+      puppetlabs_spec_helper
+      rspec
+      rspec-puppet
     rspec-support (3.1.2)
     safe_yaml (1.0.4)
+    semantic_puppet (0.1.4)
+      gettext-setup (>= 0.3)
     spdx-licenses (1.1.0)
     stomp (1.4.3)
     systemu (2.6.5)
+    text (1.3.1)
 
 PLATFORMS
   ruby
diff --git a/files/puppet/modules/pixelated/files/leap_test.rb b/files/puppet/modules/pixelated/files/leap_test.rb
index cb4d177..19dccde 100644
--- a/files/puppet/modules/pixelated/files/leap_test.rb
+++ b/files/puppet/modules/pixelated/files/leap_test.rb
@@ -8,7 +8,7 @@ class Pixelated < LeapTest
   def setup
   end
   def test_01_Are_daemons_running?
-    assert_running '/usr/bin/pixelated-user-agent'
+    assert_running service: '/usr/bin/pixelated-user-agent'
     pass
   end
   def test_02_can_connect_to_useragent?
@@ -16,4 +16,3 @@ class Pixelated < LeapTest
     pass
   end
 end
-
-- 
cgit v1.2.3