Merge pull request #1369 from chef/chris-rock/integration-ssh-test

call ssh cookbook from prepare cookbook

.kitchen.chef.yml

@@ -70,5 +70,4 @@ platforms:
 suites:
   - name: default
     run_list:
-      - recipe[ssh-hardening]
       - recipe[os_prepare]

.kitchen.ec2.yml

@@ -86,6 +86,5 @@ suites:
     run_list:
       - recipe[apt]
       - recipe[yum]
-      - recipe[ssh-hardening]
       - recipe[os_prepare]
     attributes:

.kitchen.vagrant.yml

@@ -33,6 +33,5 @@ suites:
     run_list:
       - recipe[apt]
       - recipe[yum]
-      - recipe[ssh-hardening]
       - recipe[os_prepare]
     attributes:

.kitchen.yml

@@ -79,7 +79,6 @@ suites:
   run_list:
   - recipe[apt]
   - recipe[yum]
-  - recipe[ssh-hardening]
   - recipe[os_prepare]
   attributes:
     osprepare:

test/cookbooks/os_prepare/metadata.rb

@@ -11,3 +11,4 @@ depends 'runit'
 depends 'postgresql'
 depends 'httpd', '~> 0.2'
 depends 'windows'
+depends 'ssh-hardening'

test/cookbooks/os_prepare/recipes/default.rb

@@ -7,6 +7,9 @@
 # container preparation
 include_recipe('os_prepare::prep_container')
 
+# confgure ssh
+include_recipe('os_prepare::ssh')
+
 # basic tests
 include_recipe('os_prepare::file')
 include_recipe('os_prepare::mount') unless node['osprepare']['docker']

test/cookbooks/os_prepare/recipes/ssh.rb

@@ -0,0 +1,7 @@
+# encoding: utf-8
+# author: Christoph Hartmann
+#
+# installs ssh
+return if node['platform_family'] == 'windows'
+
+include_recipe 'ssh-hardening::default'