|
27 | 27 | # Install PE
|
28 | 28 | run_puppet_install_helper
|
29 | 29 |
|
30 |
| -# Install PE License onto Master |
31 |
| -install_pe_license(master) |
| 30 | +# Install PE License onto Master, if one exists. |
| 31 | +install_pe_license(master) unless hosts_as("master").empty? |
| 32 | + |
| 33 | +# Determine root path of local module source. |
| 34 | +proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..')) |
| 35 | +# In CI install from staging forge, otherwise from local |
| 36 | +staging = { :module_name => 'puppetlabs-sqlserver' } |
| 37 | +local = { :module_name => 'sqlserver', :source => proj_root } |
32 | 38 |
|
33 | 39 | unless ENV['MODULE_provision'] == 'no'
|
34 | 40 | hosts_as("sql_host").each do |agent|
|
|
66 | 72 | on(agent, puppet("module install #{dep}"))
|
67 | 73 | end
|
68 | 74 |
|
69 |
| - # Determine root path of local module source. |
70 |
| - proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..')) |
71 |
| - |
72 |
| - # In CI install from staging forge, otherwise from local |
73 |
| - staging = { :module_name => 'puppetlabs-sqlserver' } |
74 |
| - local = { :module_name => 'sqlserver', :source => proj_root } |
75 |
| - |
76 | 75 | # Install sqlserver dependencies.
|
77 | 76 | on(agent, puppet('module install puppetlabs-stdlib'))
|
78 |
| - on(master, puppet('module install puppetlabs-stdlib')) |
79 | 77 |
|
80 | 78 | # Mount windows 2012R2 ISO to allow install of .NET 3.5 Windows Feature
|
81 | 79 | iso_opts = {
|
|
88 | 86 | # Install sqlserver module from local source.
|
89 | 87 | # See FM-5062 for more details.
|
90 | 88 | copy_module_to(agent, local)
|
91 |
| - copy_module_to(master, local) |
| 89 | + end |
| 90 | + |
| 91 | + hosts_as("master").each do |host| |
| 92 | + # Install sqlserver dependencies. |
| 93 | + on(host, puppet('module install puppetlabs-stdlib')) |
| 94 | + |
| 95 | + # Install sqlserver module from local source. |
| 96 | + # See FM-5062 for more details. |
| 97 | + local = { :module_name => 'sqlserver', :source => proj_root } |
| 98 | + copy_module_to(host, local) |
92 | 99 | end
|
93 | 100 | end
|
0 commit comments