Merge pull request #10488 from justinsb/salt_support_systemd

Salt: support systemd (don't assume Redhat <=> systemd)
2015-07-08 13:43:08 -07:00
parent 036e7eb40a 25007421ba
commit dd37642369
14 changed files with 260 additions and 71 deletions
--- a/cluster/saltbase/salt/etcd/init.sls
+++ b/cluster/saltbase/salt/etcd/init.sls
@@ -24,9 +24,11 @@ delete_etcd_default:
  file.absent:
    - name: /etc/default/etcd

+{% if pillar.get('is_systemd') %}
 delete_etcd_service_file:
  file.absent:
-    - name: /usr/lib/systemd/system/etcd.service
+    - name: {{ pillar.get('systemd_system_path') }}/etcd.service
+{% endif %}

 delete_etcd_initd:
  file.absent: