Merge pull request #24 from RSE-Cambridge/dac-ansible

Dac ansible refresh step 1

Author: JohnGarbutt

.idea/encodings.xml

@@ -3,7 +3,5 @@ language: go
 services:
     - docker
 script:
-    - make build
-    - test -f bin/amd64/fakewarp
-    - make container
-    - make test
+    - make
+    - make tar

.travis.yml

@@ -14,35 +14,37 @@
 all: deps buildlocal test format
 
 buildlocal:
-		mkdir -p `pwd`/bin
-		GOBIN=`pwd`/bin go install -v ./...
-		ls -l `pwd`/bin
+	mkdir -p `pwd`/bin
+	GOBIN=`pwd`/bin go install -v ./...
+	ls -l `pwd`/bin
 
 format:
-		go fmt ./...
+	go fmt ./...
 
 test: 
-		go test -cover -race ./...
-		go vet ./...
+	./build/rebuild_mocks.sh
+	go test -cover -race ./...
+	go vet ./...
 
 test-func:
-		./build/func_test.sh
+	./build/func_test.sh
 
 clean:
-		go clean
-		rm -rf `pwd`/bin
-		rm -rf /tmp/etcd-download
+	go clean
+	rm -rf `pwd`/bin
+	rm -rf /tmp/etcd-download
 
 deps:
-		dep ensure
+	dep ensure
 
 tar: clean buildlocal
-		tar -cvzf ./bin/data-acc-`git describe --tag`.tgz ./bin/dacd ./bin/dacctl ./fs-ansible ./tools/*.sh
+	tar -cvzf ./bin/data-acc-`git describe --tag`.tgz ./bin/dacd ./bin/dacctl ./fs-ansible ./tools/*.sh
+	sha256sum ./bin/data-acc-`git describe --tag`.tgz > ./bin/data-acc-`git describe --tag`.tgz.sha256
 
 dockercmd=docker run --rm -it -v ~/go:/go -w /go/src/github.com/RSE-Cambridge/data-acc golang:1.11
 
 docker:
-		$(dockercmd) go install -v ./...
+	$(dockercmd) go install -v ./...
 
 installdep:
 	curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh

Dockerfile.in

@@ -47,7 +47,6 @@ The following tests are currently expected to work:
 The following tests are currently a work in progress:
 
 * full end to end test deployment using ansible to install systemd unit files, with SSL certs for etcd, aimed at testing the Ansible inside virtual machines (./dac-ansible)
-* older more broken end to end deployment using docker-compose (./ansible)
 * functional tests for etcd (make test-func runs dac-func-test golang binary)
 
 ### Packages
@@ -94,6 +93,9 @@ https://golang.org/doc/install#testing
 dep 0.5.0 is used to manage dependencies. To install dep please read:
 https://golang.github.io/dep/docs/installation.html#binary-installation
 
+gomock v1.1.1 is used to generate mocks. The version is fixed to stop
+conflicts with etcd 3.3.x.
+
 To build all the golang code and run unit tests locally:
 ```
 cd ~/go/src/github.com/RSE-Cambridge/data-acc