Re-enable service.running states in Docker

buildbot/master/init.sls

@@ -14,7 +14,6 @@ buildbot-master:
       - twisted == 16.6.0  # NOTE: keep in sync with buildbot-slave sls
     - require:
       - pkg: pip
-  {% if grains.get('virtual_subtype', '') != 'Docker' %}
   service.running:
     - enable: True
     # Buildbot must be restarted manually! See 'Buildbot administration' on the
@@ -24,7 +23,6 @@ buildbot-master:
       - pip: buildbot-master
       - file: ownership-{{ common.servo_home }}/buildbot/master
       - file: /etc/init/buildbot-master.conf
-  {% endif %}
 
 deploy-{{ common.servo_home }}/buildbot/master:
   file.recurse:
@@ -79,14 +77,12 @@ ownership-{{ common.servo_home }}/buildbot/master:
     - context:
         common: {{ common }}
 
-{% if grains.get('virtual_subtype', '') != 'Docker' %}
 buildbot-github-listener:
   service.running:
     - enable: True
     - watch:
       - file: /usr/local/bin/github_buildbot.py
       - file: /etc/init/buildbot-github-listener.conf
-{% endif %}
 
 remove-old-build-logs:
   cron.present:

buildbot/slave/init.sls

@@ -50,14 +50,11 @@ buildbot-slave-dependencies:
     - template: jinja
     - context:
         common: {{ common }}
-    {% if grains.get('virtual_subtype', '') != 'Docker' %}
     - watch_in:
       - service: buildbot-slave
-    {% endif %}
 
 {% endif %}
 
-{% if grains.get('virtual_subtype', '') != 'Docker' %}
 buildbot-slave:
   service.running:
     - enable: True
@@ -66,4 +63,3 @@ buildbot-slave:
     - watch:
       - pip: buildbot-slave-dependencies
       - file: {{ common.servo_home }}/buildbot/slave
-{% endif %}

homu/init.sls

@@ -45,15 +45,13 @@ homu:
     - bin_env: /home/servo/homu/_venv
     - require:
       - virtualenv: homu
-  {% if grains.get('virtual_subtype', '') != 'Docker' %}
   service.running:
     - enable: True
     - require:
       - pip: homu
     - watch:
       - file: /home/servo/homu/cfg.toml
       - file: /etc/init/homu.conf
-  {% endif %}
 
 {{ salt['file.dirname'](homu.db) }}:
   file.directory:

intermittent-tracker/init.sls

@@ -23,7 +23,6 @@ intermittent-tracker:
     - bin_env: /home/servo/intermittent-tracker/_venv
     - require:
       - virtualenv: intermittent-tracker
-  {% if grains.get('virtual_subtype', '') != 'Docker' %}
   service.running:
     - enable: True
     - name: tracker
@@ -32,7 +31,6 @@ intermittent-tracker:
     - watch:
       - file: /home/servo/intermittent-tracker/config.json
       - file: /etc/init/tracker.conf
-  {% endif %}
 
 /home/servo/intermittent-tracker/config.json:
   file.managed:

nginx/init.sls

@@ -1,12 +1,10 @@
 nginx:
   pkg.installed: []
-  {% if grains.get('virtual_subtype', '') != 'Docker' %}
   service.running:
     - enable: True
     - watch:
       - pkg: nginx
       - file: /etc/nginx/sites-available/default
-  {% endif %}
 
 /etc/nginx/sites-available/default:
   file.managed:

salt/master.sls

@@ -16,21 +16,17 @@ salt-master-dependencies:
     - user: root
     - group: root
     - mode: 755
-    {% if grains.get('virtual_subtype', '') != 'Docker' %}
     - require_in:
       - service: salt-master
-    {% endif %}
 
 {{ rootfs_parent_dir }}/ADMIN_README:
   file.managed:
     - user: root
     - group: root
     - mode: 644
     - source: salt://{{ tpldir }}/files/master/ADMIN_README
-    {% if grains.get('virtual_subtype', '') != 'Docker' %}
     - require_in:
       - service: salt-master
-    {% endif %}
 {% endfor %}
 
 salt-master:
@@ -40,13 +36,11 @@ salt-master:
     - require:
       - sls: salt.common
       - pkg: salt-master-dependencies
-  {% if grains.get('virtual_subtype', '') != 'Docker' %}
   service.running:
     - enable: True
     - require:  # Updates and upgrades must be handled manually
       - file: /etc/salt/master
       - pkg: salt-master
-  {% endif %}
 
 /etc/salt/master:
   file.managed:

xvfb/init.sls

@@ -7,10 +7,8 @@
 
 xvfb:
   pkg.installed: []
-  {% if grains.get('virtual_subtype', '') != 'Docker' %}
   service.running:
     - enable: True
     - watch:
       - pkg: xvfb
       - file: /etc/init/xvfb.conf
-  {% endif %}