Merge pull request #6498 from ArtfulCoder/stop_nginx_service

Disable nginx service

Merge pull request #6498 from ArtfulCoder/stop_nginx_service
1ccfa589 · Brendan Burns · 3cf04a66 · a0ea2c67 · 1ccfa589
Commit 1ccfa589 authored Apr 07, 2015 by Brendan Burns
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

init.sls cluster/saltbase/salt/nginx/init.sls +0 -2

No files found.
--- a/cluster/saltbase/salt/nginx/init.sls
+++ b/cluster/saltbase/salt/nginx/init.sls
@@ -48,8 +48,6 @@ stop_nginx-service:
  service.dead:
    - name: nginx
    - enable: None
-    - watch:
-      - file: /etc/kubernetes/manifests/nginx.json

 {% else %}
 nginx-service: