lib/vagrant-invade/module/provision/salt/template.erb in vagrant-invade-0.6.2 vs lib/vagrant-invade/module/provision/salt/template.erb in vagrant-invade-0.6.3
- old
+ new
@@ -1,19 +1,17 @@
-
<%= machine_name %>.vm.provision :salt do |salt|
<% if install_master %>
- # -- INSTALL OPTIONS -- #
salt.install_master = <%= install_master %>
<% end %>
<% if no_minion %>
salt.no_minion = <%= no_minion %>
<% end %>
- <% if install_syndic %>
- salt.install_syndic = <%= install_syndic %>
+ <% if install_syncdir %>
+ salt.install_syncdir = <%= install_syncdir %>
<% end %>
<% if install_type %>
- salt.install_type = <%= install_type %>
+ salt.install_type = '<%= install_type %>'
<% end %>
<% if install_args %>
salt.install_args = '<%= install_args %>'
<% end %>
<% if always_install %>
@@ -27,11 +25,10 @@
<% end %>
<% if version %>
salt.version = '<%= version %>'
<% end %>
<% if minion_config %>
- # -- MINION OPTIONS -- #
salt.minion_config = '<%= minion_config %>'
<% end %>
<% if minion_key %>
salt.minion_key = '<%= minion_key %>'
<% end %>
@@ -49,11 +46,10 @@
<% end %>
<% if minion_pub %>
salt.minion_pub = '<%= minion_pub %>'
<% end %>
<% if master_config %>
- # -- MASTER OPTIONS -- #
salt.master_config = '<%= master_config %>'
<% end %>
<% if master_key %>
salt.master_key = '<%= master_key %>'
<% end %>
@@ -61,7 +57,24 @@
salt.master_pub = '<%= master_pub %>'
<% end %>
<% if seed_master %>
salt.seed_master = '<%= seed_master %>'
<% end %>
-
+ <% if run_highstate %>
+ salt.run_highstate = <%= run_highstate %>
+ <% end %>
+ <% if run_overstate %>
+ salt.run_overstate = <%= run_overstate %>
+ <% end %>
+ <% if orchestration %>
+ salt.orchestration = <%= orchestration %>
+ <% end %>
+ <% if colorize %>
+ salt.colorize = <%= colorize %>
+ <% end %>
+ <% if log_level %>
+ salt.log_level = '<%= log_level %>'
+ <% end %>
+ <% if pillar %>
+ salt.pillar = <%= pillar %>
+ <% end %>
end