Fix gerrit 3552, incorrect path
build inventory for maas playbook use
Vagrant uses the parent directory of Vagrantfile to name it's VMs
Change-Id: I4780b2a40d3531ae92a89f35632227eb56c055e3
diff --git a/Vagrantfile b/Vagrantfile
index 103710d..b9ec139 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,7 +1,7 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :
-$cordpath = "../../.."
+$cordpath = ".."
Vagrant.configure(2) do |config|
diff --git a/build.gradle b/build.gradle
index e138caf..140b90f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -287,6 +287,11 @@
args = ["-p", "$config.headnode.ansible_ssh_port", "$config.headnode.ansible_user@$config.headnode.ip", ansible_cmd ]
}
+
+
+project(':maas').prime.dependsOn writeYamlConfig
+project(':maas').prime.dependsOn writeInventory
+
project('onos-apps').publishMavenRepoImage.dependsOn project(':maas').prime
project(':onos-apps').deploy.dependsOn project(':maas').deployBase
diff --git a/scripts/cord-in-a-box.sh b/scripts/cord-in-a-box.sh
index b667519..4951df2 100755
--- a/scripts/cord-in-a-box.sh
+++ b/scripts/cord-in-a-box.sh
@@ -12,6 +12,7 @@
CONFIG=config/cord_in_a_box.yml
SSHCONFIG=~/.ssh/config
VAGRANT_CWD=${CORDDIR}/build/
+VAGRANT_VM_PREFIX=build
# CORD versioning
REPO_BRANCH="master"
@@ -378,7 +379,7 @@
for i in `seq 1 $NUM_COMPUTE_NODES`;
do
echo adding the compute node: compute-node-$i
- add_compute_node compute-node-$i cord-in-a-box_compute-node-$i
+ add_compute_node compute-node-$i ${VAGRANT_VM_PREFIX}_compute-node-$i
done
echo "==> Adding compute nodes: Complete"