Permalink
Browse files

strip different line endings from version strings

  • Loading branch information...
1 parent ce3f4f9 commit 57e5cff2d1623a7c92954e57493d926a8de7e96c @justinstoller committed Mar 22, 2012
Showing with 4 additions and 3 deletions.
  1. +2 −2 lib/test_config.rb
  2. +2 −1 setup/pe/02_PE-InstallWindows.rb
View
@@ -40,7 +40,7 @@ def self.load_pe_version
File.open("#{dist_dir}/#{version_file}") do |file|
while line = file.gets
if /(\w.*)/ =~ line then
- version=$1
+ version=$1.strip
Log.debug "Found LATEST: Puppet Enterprise Version #{version}"
end
end
@@ -63,7 +63,7 @@ def self.load_pe_version_win
File.open("#{dist_dir}/#{version_file}") do |file|
while line = file.gets
if /(\w.*)/ =~ line then
- version=$1
+ version=$1.strip
Log.debug "Found LATEST: Puppet Enterprise Windows Version #{version}"
end
end
@@ -2,6 +2,7 @@
version = config['pe_ver_win']
test_name "Install Puppet #{version}"
+the_master = master.to_s
confine :to, :platform => 'windows'
distpath = "/opt/enterprise/dists"
@@ -23,5 +24,5 @@
scp_to host, "#{distpath}/#{host['dist']}.msi", "/tmp"
step "Install Puppet Agent"
- on host,"cd /tmp && msiexec.exe /qn /i #{host['dist']}.msi"
+ on host,"cd /tmp && msiexec.exe /qn /i #{host['dist']}.msi PUPPET_MASTER_SERVER=#{the_master} PUPPET_AGENT_CERTNAME=#{host}"
end

0 comments on commit 57e5cff

Please sign in to comment.