commit 455cec4802c419bbb37a90feac8846658f14efbc
author Zack Williams <zdw@artisancomputer.com> Wed May 25 16:07:36 2016 -0700
committer Zack Williams <zdw@artisancomputer.com> Wed May 25 16:07:36 2016 -0700
tree 55b4eb64f929c2cbfeb0c3020f4a363669138490
parent 62587be69f6de9cc608db7babfec7a73973f12bb

fix merge error

scripts/single-node-pod.sh

diff --git a/scripts/single-node-pod.sh b/scripts/single-node-pod.sh
index 35af39c..21fe9c8 100755
--- a/scripts/single-node-pod.sh
+++ b/scripts/single-node-pod.sh
@@ -73,6 +73,11 @@
     sleep 30
 
     ssh ubuntu@xos "cd xos/xos/configurations/cord-pod; make cord"
+
+    if [[ $EXAMPLESERVICE -eq 1 ]]
+    then
+      ssh ubuntu@xos "cd xos/xos/configurations/cord-pod; make exampleservice"
+    fi
 }
 
 function setup_test_client() {
@@ -90,11 +95,6 @@
     ssh ubuntu@nova-compute "sudo lxc-attach -n testclient -- ip link add link eth0.222 name eth0.222.111 type vlan id 111"
     ssh ubuntu@nova-compute "sudo lxc-attach -n testclient -- ifconfig eth0.222 up"
     ssh ubuntu@nova-compute "sudo lxc-attach -n testclient -- ifconfig eth0.222.111 up"
-
-    if [[ $EXAMPLESERVICE -eq 1 ]]
-    then
-      ssh ubuntu@xos "cd xos/xos/configurations/cord-pod; make exampleservice"
-    fi
 }
 
 function run_e2e_test() {