commit e6c255f01e8e7e43d17caa446b8b366a37d4fcce
author Andy Bavier <andy@onlab.us> Fri Sep 15 16:13:37 2017 -0700
committer Andy Bavier <andy@onlab.us> Fri Sep 15 17:06:30 2017 -0700
tree 50e9012264acf89ed06b5d5513922401418082a1
parent 08fe39f7549965f40f7c955cd610a6553ff08e7e

CORD-1811 Add Vagrant ssh-config to ~/.ssh/config

Change-Id: Ie3630f2990af30528b4f966d8b6d98fc040d94ae

Makefile

diff --git a/Makefile b/Makefile
index fe2775e..a977e98 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,6 @@
 VAGRANT_VMS      ?= $(HEADNODE)
 VAGRANT_SWITCHES ?= leaf1
 VAGRANT_CWD      ?= $(SCENARIOS_D)/$(SCENARIO)/
-VAGRANT_SSH_CONF ?= $(GENCONFIG_D)/vagrant.ssh_config
 
 # Virsh config
 VIRSH_CORDDEV_DOMAIN ?= cord_corddev
@@ -197,8 +196,8 @@
 	touch $@
 
 $(M)/vagrant-ssh-install: | $(M)/vagrant-up
-	$(VAGRANT) ssh-config $(VAGRANT_VMS) > $(VAGRANT_SSH_CONF) $(LOGCMD)
-	$(BUILD)/scripts/vagrant-ssh-install.sh "$(VAGRANT_SSH_CONF)" "Include $(abspath $(GENCONFIG_D))/*.ssh_config" $(LOGCMD)
+	$(VAGRANT) ssh-config $(VAGRANT_VMS) > /tmp/vagrant_ssh_config
+	$(ANSIBLE_PB) $(BUILD)/ansible/vagrant-ssh-install.yml $(LOGCMD)
 	touch $@
 
 $(M)/config-ssh-key: | $(M)/vagrant-up