Initial generic-worker config file

etc/taskcluster/macos/README.md

@@ -13,4 +13,8 @@ or install `salt-ssh` through some other mean and run in from this directory.
 cd etc/taskcluster/macos
 ./salt-ssh '*' test.ping
 ./salt-ssh '*' state.apply test=True
-```
+```
+
+## Worker’s client ID
+
+`project/servo/worker/macos/1`

etc/taskcluster/macos/Saltfile

@@ -1,2 +1,3 @@
 salt-ssh:
-  config_dir: ./config
+  config_dir: ./config
+  state_verbose: False

etc/taskcluster/macos/states/generic-worker.sls

@@ -1,4 +1,7 @@
-/usr/local/bin/generic-worker:
+{% set bin = "/usr/local/bin" %}
+{% set keyfile = "/etc/generic-worker/key" %}
+
+{{ bin }}/generic-worker:
   file.managed:
     - name:
     - source: https://github.com/taskcluster/generic-worker/releases/download/v11.0.1/generic-worker-darwin-amd64
@@ -6,18 +9,28 @@
     - mode: 755
     - makedirs: True
 
-/usr/local/bin/livelog:
+{{ bin }}/livelog:
   file.managed:
     - source: https://github.com/taskcluster/livelog/releases/download/v1.1.0/livelog-darwin-amd64
     - source_hash: sha256=be5d4b998b208afd802ac6ce6c4d4bbf0fb3816bb039a300626abbc999dfe163
     - mode: 755
     - makedirs: True
 
-/etc/generic-worker:
+/etc/generic-worker/config.json:
-  file.directory:
+  file.serialize:
-    - dir_mode: 700
+    - makedirs: True
+    - mode: 600
+    - show_changes: False
+    - formatter: json
+    - dataset:
+        provisionerId: proj-servo
+        workerType: macos
+        workerId: servo-macos-1
+        clientId: project/servo/worker/macos/1
+        publicIP: {{ salt.network.ip_addrs()[0] }}
+        signingKeyLocation: {{ keyfile }}
 
-generic-worker new-openpgp-keypair --file /etc/generic-worker/key:
+generic-worker new-openpgp-keypair --file {{ keyfile }}:
   cmd.run:
-    - creates: /etc/generic-worker/key
+    - creates: {{ keyfile }}
-    - prepend_path: /usr/local/bin
+    - prepend_path: {{ bin }}