Merge branch 'master' into etcd-sync

This commit is contained in:
Greg Althaus 2016-01-21 13:13:58 -06:00
commit 32877bdc7b

View file

@ -17,7 +17,7 @@
- name: "Identify init system"
shell: >
$(pgrep systemd > /dev/null && systemctl status > /dev/null);
$(pgrep systemd > /dev/null && systemctl status network > /dev/null);
if [ $? -eq 0 ] ; then
echo systemd;
else