Skip to content

Commit

Permalink
Merge pull request redhat-openstack#245 from mhaskel/merge_1.1.x
Browse files Browse the repository at this point in the history
Merge 1.1.x
  • Loading branch information
cyberious committed Nov 14, 2014
2 parents d97a047 + 0613485 commit 5f5b892
Showing 1 changed file with 18 additions and 20 deletions.
38 changes: 18 additions & 20 deletions spec/spec_helper_acceptance.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,23 @@

hosts.each do |host|
on hosts, "mkdir -p #{host['distmoduledir']}"
if host['platform'] =~ /sles-1/i || host['platform'] =~ /solaris-1/i
get_stdlib = <<-EOS
package{'wget':}
exec{'download':
command => "wget -P /root/ https://forgeapi.puppetlabs.com/v3/files/puppetlabs-stdlib-4.3.2.tar.gz --no-check-certificate",
path => ['/opt/csw/bin/','/usr/bin/']
}
EOS
apply_manifest_on(host, get_stdlib)
# have to use force otherwise it checks ssl cert even though it is a local file
on host, puppet('module install /root/puppetlabs-stdlib-4.3.2.tar.gz --force --ignore-dependencies'), {:acceptable_exit_codes => [0, 1]}
elsif host['platform'] =~ /windows/i
on host, shell('curl -k -o c:/cygwin64/home/Administrator/puppetlabs-stdlib-4.3.2.tar.gz https://forgeapi.puppetlabs.com/v3/files/puppetlabs-stdlib-4.3.2.tar.gz')
on host, puppet('module install c:/cygwin64/home/Administrator/puppetlabs-stdlib-4.3.2.tar.gz --force --ignore-dependencies')
else
on host, puppet('module install puppetlabs-stdlib'), {:acceptable_exit_codes => [0, 1]}
end
end
end

Expand All @@ -26,27 +43,8 @@

# Configure all nodes in nodeset
c.before :suite do
# Install module and dependencies
hosts.each do |host|
if fact_on(host, 'osfamily') == 'windows'
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"
result = on host, "echo #{host['distmoduledir']}/concat"
target = result.raw_output.chomp

%w(files lib manifests metadata.json).each do |file|
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]}
copy_module_to(host, :source => proj_root, :module_name => 'concat')
end
end

Expand Down

0 comments on commit 5f5b892

Please sign in to comment.