Skip to content

Commit 3d09675

Browse files
committed
fix(contrib/vagrant): fix vagrant n-node Makefile
The fleetctl commands weren't valid, and we should disable host checking, as Vagrant nodes will change frequently.
1 parent 069d704 commit 3d09675

2 files changed

Lines changed: 10 additions & 12 deletions

File tree

contrib/vagrant/Makefile

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,30 @@ COMPONENTS=registry logger database cache controller builder router
1818

1919
all: build run
2020

21-
test_client:
22-
python -m unittest discover client.tests
23-
2421
pull:
2522
$(call ssh_all,'for c in $(COMPONENTS); do docker pull deis/$$c; done')
2623

2724
build:
2825
$(call ssh_all,'cd share && for c in $(COMPONENTS); do cd $$c && docker build -t deis/$$c . && cd ..; done')
2926

3027
install:
31-
for c in $(COMPONENTS); do fleetctl enable ../../$$c/systemd/*; done
28+
for c in $(COMPONENTS); do fleetctl --strict-host-key-checking=false submit ../../$$c/systemd/*; done
3229

3330
uninstall: stop
34-
for c in $(COMPONENTS); do fleetctl disable ../../$$c/systemd/*; done
31+
for c in $(COMPONENTS); do fleetctl --strict-host-key-checking=false destroy ../../$$c/systemd/*; done
3532

3633
start:
37-
for c in $(COMPONENTS); do fleetctl start ../../$$c/systemd/*; done
34+
for c in $(COMPONENTS); do fleetctl --strict-host-key-checking=false start ../../$$c/systemd/*; done
3835

3936
stop:
40-
for c in $(COMPONENTS); do fleetctl stop ../../$$c/systemd/*; done
37+
for c in $(COMPONENTS); do fleetctl --strict-host-key-checking=false stop ../../$$c/systemd/*; done
4138

42-
restart:
43-
for c in $(COMPONENTS); do fleetctl restart ../../$$c/systemd/*; done
39+
restart: stop start
4440

45-
run: install restart
41+
run: install start
4642

4743
clean: uninstall
48-
$(call ssh_all,'cd share && for c in $(COMPONENTS); do docker rm -f deis-$$c; done')
44+
$(call ssh_all,'for c in $(COMPONENTS); do docker rm -f deis-$$c; done')
4945

5046
full-clean: clean
51-
$(call ssh_all,'cd share && for c in $(COMPONENTS); do docker rmi deis-$$c; done')
47+
$(call ssh_all,'for c in $(COMPONENTS); do docker rmi deis-$$c; done')

contrib/vagrant/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ On your workstation:
1212
* Configure the fleetctl client to tunnel through one of the VMs:
1313
* `export FLEETCTL_TUNNEL=172.17.8.100`
1414
* (Note that IP addressing for the VMs starts at .100, but you can connect to any VM in the cluster)
15+
* Add your Vagrant-generated SSH key to the ssh-agent (fleetctl tunnel requires the agent to have this key)
16+
* `ssh-add ~/.vagrant.d/insecure_private_key`
1517

1618
## Launching Deis
1719
Follow the normal instructions in the [README](../../README.md) for launching and using Deis, with the caveat that

0 commit comments

Comments
 (0)