Merge pull request #16 from realraum/openwrt-image

[noc.git] / ansible / tuer.yml

diff --git a/ansible/tuer.yml b/ansible/tuer.yml
index 438a65b..0d26eb3 100644 (file)
--- a/ansible/tuer.yml
+++ b/ansible/tuer.yml
@@ -1,6 +1,7 @@
+---
 - hosts: torwaechter
   connection: local
-  tasks:
+  pre_tasks:
     - name: Create go directories
       file:
         path: .cache/openwrt/tuer/{{ item }}
@@ -14,8 +15,6 @@
         update: True
       with_items: [ door_and_sensors ]
 
-#    - name: Build update-keys
-
     - name: Download dependencies
       command: go get -d ./...
       args:
@@ -23,7 +22,7 @@
       environment:
         GOCACHE: "{{ playbook_dir }}/.cache/openwrt/tuer/gocache"
         GOPATH:  "{{ playbook_dir }}/.cache/openwrt/tuer/gopath"
-      with_items: [ door_client, door_daemon ]
+      with_items: [ door_client, door_daemon, update-keys ]
 
     - name: Cross-compile Go binaries
       command: go build -ldflags "-s"
@@ -36,30 +35,8 @@
         CGO_ENABLED: 0
         GOOS: linux
         GOARCH: 386
-      with_items: [ door_client, door_daemon ]
+      with_items: [ door_client, door_daemon, update-keys ]
 
-- hosts: torwaechter
-  connection: local
   roles:
     - role: openwrt-image
       delegate_to: localhost
-      vars:
-        openwrt_arch: x86
-        openwrt_target: geode
-        openwrt_packages_remove:
-          - ppp
-          - ppp-mod-pppoe
-          - dnsmasq
-          - firewall
-          - odhcpd
-        openwrt_packages_add:
-          - flashrom
-          - haveged
-          - htop
-          - hwclock
-          - ip
-          - less
-          - nano
-          - tcpdump
-        openwrt_packages_extra:
-          - git