Merge pull request redhat-openstack#242 from mhaskel/test

merge 1.1.x into master

CHANGELOG.md

@@ -1,3 +1,16 @@
+##2014-10-28 - Supported Release 1.1.2
+
+###Summary
+
+This release includes bugfixes and test improvements. The module was tested against SLES10 and SLES12 and found to work against those platforms with no module improvements. Metadata was updated to include those as supported platforms.
+
+####Bugfixes
+- newline didn't work for Windows and Solaris. This has been fixed.
+- Install certs on Windows for acceptance tests
+- Update tests to work with strict variables (no module updates were required)
+- Update tests to work on Windows
+- Fix typo in CHANGELOG.md
+
 ##2014-09-10 - Supported Release 1.1.1
 
 ###Summary

metadata.json

@@ -1,12 +1,12 @@
 {
   "name": "puppetlabs-concat",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "author": "Puppet Labs",
   "summary": "Concat module",
   "license": "Apache-2.0",
   "source": "https://github.com/puppetlabs/puppetlabs-concat",
   "project_page": "https://github.com/puppetlabs/puppetlabs-concat",
-  "issues_url": "https://github.com/puppetlabs/puppetlabs-concat/issues",
+  "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",

spec/spec_helper_acceptance.rb

@@ -4,9 +4,13 @@
 unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
   # This will install the latest available package on el and deb based
   # systems fail on windows and osx, and install via gem on other *nixes
-  foss_opts = { :default_action => 'gem_install' }
+  foss_opts = {:default_action => 'gem_install'}
 
-  if default.is_pe?; then install_pe; else install_puppet( foss_opts ); end
+  if default.is_pe?; then
+    install_pe;
+  else
+    install_puppet(foss_opts);
+  end
 
   hosts.each do |host|
     on hosts, "mkdir -p #{host['distmoduledir']}"
@@ -25,7 +29,13 @@
     # Install module and dependencies
     hosts.each do |host|
       if fact_on(host, 'osfamily') == 'windows'
-        on host, 'powershell.exe -command "(New-Object System.Net.Webclient).DownloadString(\'https://forge.puppetlabs.com\')"'
+        pp = <<EOS
+  exec{'download-cert':
+    path => ['C:\Windows\System32\WindowsPowershell\v1.0','C:\Windows\Sysnative\WindowsPowershell\v1.0'],
+    command => 'powershell.exe -command "(New-Object System.Net.Webclient).DownloadString(\"https://forge.puppetlabs.com\")"',
+  }
+EOS
+        apply_manifest_on(host, pp)
       end
 
       on host, "mkdir -p #{host['distmoduledir']}/concat"
@@ -36,7 +46,7 @@
         scp_to host, "#{proj_root}/#{file}", target
       end
       #copy_module_to(host, :source => proj_root, :module_name => 'concat')
-      on host, puppet('module','install','puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
+      on host, puppet('module', 'install', 'puppetlabs-stdlib'), {:acceptable_exit_codes => [0, 1]}
     end
   end