Merge pull request #1 from jhadvig/salt_update

Update salt script for build-controller
jhadvig · Aug 26, 2014 · 3c33b42 · 3c33b42
2 parents 7da3b8a + 687e35d
commit 3c33b42
Showing 1 changed file with 3 additions and 21 deletions.
diff --git a/cluster/saltbase/salt/build-controller/init.sls b/cluster/saltbase/salt/build-controller/init.sls
@@ -24,24 +24,6 @@
       - group
       - mode
 
-build-controller-third-party-go:
-  file.recurse:
-    - name: {{ root }}/src
-    - source: salt://third-party/go/src
-    - user: root
-    {% if grains['os_family'] == 'RedHat' %}
-    - group: root
-    {% else %}
-    - group: staff
-    {% endif %}
-    - dir_mode: 775
-    - file_mode: 664
-    - makedirs: True
-    - recurse:
-      - user
-      - group
-      - mode
-
 {{ environment_file }}:
   file.managed:
     - source: salt://build-controller/default
@@ -51,14 +33,14 @@ build-controller-third-party-go:
     - mode: 644
 
 build-controller-build:
-  cmd.wait:
+  cmd.run:
     - cwd: {{ root }}
     - names:
       - go build {{ package }}/cmd/build-controller
     - env:
       - PATH: {{ grains['path'] }}:/usr/local/bin
-      - GOPATH: {{ root }}
-    - watch:
+      - GOPATH: {{ root }}:{{ package_dir }}/Godeps/_workspace
+    - require:
       - file: {{ package_dir }}
 
 /usr/local/bin/build-controller: