Merge pull request #34 from salt-formulas/pr_stateoutput
add minion.conf default output/log level settings
diff --git a/salt/control/virt.sls b/salt/control/virt.sls
index 0bb9f80..35987a2 100644
--- a/salt/control/virt.sls
+++ b/salt/control/virt.sls
@@ -69,6 +69,17 @@
# - path: /srv/salt-images/{{ node_name }}.{{ cluster.domain }}/system.qcow2
# - id_: {{ node_name }}.{{ cluster.domain }}
# - unless: virsh list | grep {{ node_name }}.{{ cluster.domain }}
+
+{%- if node.get("autostart", True) %}
+
+salt_virt_autostart_{{ cluster_name }}_{{ node_name }}:
+ module.run:
+ - name: virt.set_autostart
+ - vm_: {{ node_name }}.{{ cluster.domain }}
+ - state: true
+ - unless: virsh list --autostart | grep {{ node_name }}.{{ cluster.domain }}
+
+{%- endif %}
{%- endif %}
diff --git a/salt/map.jinja b/salt/map.jinja
index b0f03da..155243e 100644
--- a/salt/map.jinja
+++ b/salt/map.jinja
@@ -142,7 +142,10 @@
virt_pkgs:
- libvirt-dev
- pkg-config
+{% if grains.oscodename == 'trusty' %}
- libguestfs-tools
+{% endif %}
+
RedHat:
virt_pkgs:
- libvirt-dev
diff --git a/salt/meta/sensu.yml b/salt/meta/sensu.yml
index fc529c9..ebf81c0 100644
--- a/salt/meta/sensu.yml
+++ b/salt/meta/sensu.yml
@@ -1,6 +1,6 @@
check:
local_salt_master_proc:
- command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C salt-master -u root -c 1:15"
+ command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C salt-master -u root -c 1:50"
interval: 60
occurrences: 1
subscribers: