Merge branch 'develop'

2 files changed, 116 insertions, 0 deletions

diff --git a/puppet/modules/sshd b/puppet/modules/sshd
deleted file mode 160000
-Subproject 76f4f872f81209a52df2205fd88b5619df58f00
diff --git a/puppet/modules/sshd/Gemfile.lock b/puppet/modules/sshd/Gemfile.lock
new file mode 100644
index 00000000..0c2c58e9
--- /dev/null
+++ b/puppet/modules/sshd/Gemfile.lock
@@ -0,0 +1,116 @@
+GIT
+  remote: https://github.com/rodjek/rspec-puppet.git
+  revision: c44381a240ec420d4ffda7bffc55ee4d9c08d682
+  specs:
+    rspec-puppet (1.0.1)
+      rspec
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    builder (3.2.2)
+    diff-lcs (1.2.5)
+    excon (0.31.0)
+    facter (1.7.4)
+    fog (1.19.0)
+      builder
+      excon (~> 0.31.0)
+      formatador (~> 0.2.0)
+      mime-types
+      multi_json (~> 1.0)
+      net-scp (~> 1.1)
+      net-ssh (>= 2.1.3)
+      nokogiri (~> 1.5)
+      ruby-hmac
+    formatador (0.2.4)
+    hiera (1.3.1)
+      json_pure
+    hiera-puppet (1.0.0)
+      hiera (~> 1.0)
+    highline (1.6.20)
+    json (1.8.1)
+    json_pure (1.8.1)
+    kwalify (0.7.2)
+    librarian-puppet (0.9.10)
+      json
+      thor (~> 0.15)
+    metaclass (0.0.2)
+    mime-types (1.25.1)
+    mocha (1.0.0)
+      metaclass (~> 0.0.1)
+    multi_json (1.8.4)
+    net-scp (1.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.7.0)
+    nokogiri (1.5.11)
+    puppet (3.4.2)
+      facter (~> 1.6)
+      hiera (~> 1.0)
+      rgen (~> 0.6.5)
+    puppet-lint (0.3.2)
+    puppetlabs_spec_helper (0.4.1)
+      mocha (>= 0.10.5)
+      rake
+      rspec (>= 2.9.0)
+      rspec-puppet (>= 0.1.1)
+    rake (10.1.1)
+    rbvmomi (1.8.1)
+      builder
+      nokogiri (>= 1.4.1)
+      trollop
+    rgen (0.6.6)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-hiera-puppet (1.0.0)
+      hiera (>= 1.0)
+      hiera-puppet (>= 1.0)
+      puppet (>= 3.0)
+      rspec
+      rspec-puppet
+    rspec-mocks (2.14.4)
+    rspec-system (2.8.0)
+      fog (~> 1.18)
+      kwalify (~> 0.7.2)
+      mime-types (~> 1.16)
+      net-scp (~> 1.1)
+      net-ssh (~> 2.7)
+      nokogiri (~> 1.5.10)
+      rbvmomi (~> 1.6)
+      rspec (~> 2.14)
+      systemu (~> 2.5)
+    rspec-system-puppet (2.2.1)
+      rspec-system (~> 2.0)
+    rspec-system-serverspec (2.0.1)
+      rspec-system (~> 2.0)
+      serverspec (~> 0.0)
+      specinfra (~> 0.0)
+    ruby-hmac (0.4.0)
+    serverspec (0.14.4)
+      highline
+      net-ssh
+      rspec (>= 2.13.0)
+      specinfra (>= 0.1.0)
+    specinfra (0.4.1)
+    systemu (2.6.0)
+    thor (0.18.1)
+    trollop (2.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  librarian-puppet (>= 0.9.10)
+  puppet (>= 2.7.0)
+  puppet-lint (>= 0.3.2)
+  puppetlabs_spec_helper (>= 0.2.0)
+  rake (>= 0.9.2.2)
+  rspec-hiera-puppet
+  rspec-puppet!
+  rspec-system-puppet
+  rspec-system-serverspec
+  serverspec