Fix salt formulas to run on first start

alfresco/tools.sls

@@ -39,14 +39,6 @@ install_libreoffice:
         - require:
             - cmd: install_libreoffice
 
-swftools:
-  pkg.installed:
-    - pkgs:
-      - libjpeg-turbo
-      - zlib
-      - giflib
-      - freetype
-
 {% else %}
 
 libreoffice:
@@ -59,9 +51,6 @@ libreoffice:
     - require:
       - pkgrepo: libreoffice
 
-swftools:
-   pkg.installed
-
 {% endif %}
 
 {% if grains['osrelease'] == '14.04' %}

karaf/init.sls

@@ -33,7 +33,7 @@ create_service_wrapper:
       - archive: extract_karaf
       - environ: JAVA_HOME
 
-create_service:
+karaf_create_service:
 {% if grains['os_family'] == 'RedHat' %}
   file.managed:
     - name: {{ karaf.svcdest }}
@@ -45,15 +45,14 @@ create_service:
     - force: True
 {% endif %}
 
-{% if grains['os_family'] == 'RedHat' or grains['oscodename'] != 'trusty' %}
-reload_systemd:
+karaf_reload_systemd:
   cmd.wait:
     - name: systemctl daemon-reload
     - watch:
-      - file: create_service
+      - file: karaf_create_service
+      - cmd: create_service_wrapper
     - require_in:
       - service: karaf
-{% endif %}
 
 enable_https:
   file.replace:
@@ -67,7 +66,7 @@ karaf:
   service.running:
     - enable: True
     - watch:
-      - file: create_service
+      - file: karaf_create_service
       - file: get_config
       - file: enable_https