commit ef85125615a18e501169a428be10fcd51b9b7875
author Scott Baker <smbaker@gmail.com> Mon Jun 20 10:15:12 2016 -0700
committer Scott Baker <smbaker@gmail.com> Mon Jun 20 10:15:12 2016 -0700
tree b3f9e3bc8f2483c56c1255ca519980c7ea67b2fe
parent 9cb3f2ebd3b2506a9d9a8d7c7036b2e40a191a93
parent 1b2f136a080d688a389222c6699ac71731b192bf

Merge branch 'master' of github.com:open-cloud/openstack-cluster-setup

scripts/single-node-pod.sh

diff --git a/scripts/single-node-pod.sh b/scripts/single-node-pod.sh
index 4ae7f42..448910e 100755
--- a/scripts/single-node-pod.sh
+++ b/scripts/single-node-pod.sh
@@ -65,13 +65,6 @@
     ssh ubuntu@xos "cd xos; git config --global user.email 'ubuntu@localhost'; git config --global user.name 'XOS ExampleService'"
     ssh ubuntu@xos "cd xos; git checkout $XOS_BRANCH"
 
-    if [[ $EXAMPLESERVICE -eq 1 ]]
-    then
-      echo ""
-      echo "Adding exampleservice to XOS"
-      ssh ubuntu@xos "cd xos; git cherry-pick cd6e972210f4134ffb2f7a36fb3c4baf33f02bef"
-    fi
-
     echo "Rebuilding XOS containers"
     ssh ubuntu@xos "cd xos/containers/xos; make base"
     ssh ubuntu@xos "cd xos/xos/configurations/cord-pod; make local_containers"