commit a138bf7c391d5aa6e8b9c0c9f23b6e4abfaf272e
author Zack Williams <zdw@cs.arizona.edu> Tue Oct 17 08:35:00 2017 -0700
committer Zack Williams <zdw@cs.arizona.edu> Tue Oct 17 09:16:11 2017 -0700
tree b4d4be8151945b33388d4eb982ad075292c655c7
parent 63dd02f7aa0fc911bc2b09ad22d2aafee735c7b7

[CORD-2094] v2
Make SSH config key gen and copy not reliant on vagrant

Change-Id: I2df8e06b080321ff79a246381e93710479582457
(cherry picked from commit 39c9aa90a23c69682c67572ae96be09beecf57a7)

Makefile

diff --git a/Makefile b/Makefile
index 91f92cd..24218ef 100644
--- a/Makefile
+++ b/Makefile
@@ -167,7 +167,7 @@
 VAGRANT_UP_PREREQS       ?=
 COPY_CORD_PREREQS        ?=
 CORD_CONFIG_PREREQS      ?=
-COPY_CONFIG_PREREQS      ?=
+CONFIG_SSH_KEY_PREREQS   ?=
 PREP_BUILDNODE_PREREQS   ?=
 PREP_HEADNODE_PREREQS    ?=
 DOCKER_IMAGES_PREREQS    ?=
@@ -204,7 +204,7 @@
 	$(ANSIBLE_PB) $(BUILD)/ansible/vagrant-ssh-install.yml $(LOGCMD)
 	touch $@
 
-$(M)/config-ssh-key: | $(M)/vagrant-up
+$(M)/config-ssh-key: | $(CONFIG_SSH_KEY_PREREQS)
 	$(ANSIBLE_PB) $(BUILD)/ansible/config-ssh-key.yml $(LOGCMD)
 	touch $@