From 5b8bffb103e73ae6ef9d385f5b89f442cce7cf4d Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@b1-systems.de>
Date: Thu, 11 Dec 2014 21:46:46 +0100
Subject: [PATCH] Directly use the provided Vagrantbox on Atlas

Change-Id: Ib3cfb474c712c2a123cc6493f69141e85c4d16b6
---
 Vagrantfile          |  7 +------
 scripts/bootstrap.sh | 11 -----------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 898b72f..0433360 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -28,7 +28,7 @@ def add_block_device(node, port, size)
 end
 
 Vagrant.configure(2) do |config|
-  config.vm.box = 'packstack-template'
+  config.vm.box = CONFIG['box']
   config.vm.synced_folder '.', '/vagrant', disabled: true
   config.vm.provider "virtualbox" do |vb|
     vb.customize ["modifyvm", :id, "--memory", CONFIG['resources']['memory']]
@@ -45,11 +45,6 @@ Vagrant.configure(2) do |config|
     config.cache.scope = :machine
   end
 
-  config.vm.define 'template' do |node|
-    node.vm.box = CONFIG['box']
-    node.vm.hostname = 'template'
-  end
-
   CONFIG['address']['compute'].each_with_index do |address, index|
     name = "compute#{index + 1}"
     config.vm.define name do |node|
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 80e2e5e..4eee1cf 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -15,17 +15,6 @@ echo "$(date) cleaning up"
 rm -f log/*
 vagrant destroy
 
-vagrant box list | grep packstack-template > /dev/null
-if [[ $? -ne 0 ]]; then
-    echo "$(date) preparing template"
-    vagrant up template 2>&1 >> log/template.log
-    vagrant halt template 2>&1 >> log/template.log
-    vagrant package --output packstack-template.box template 2>&1 >> log/template.log
-    vagrant destroy --force template 2>&1 >> log/template.log
-    vagrant box add --force --name packstack-template --provider virtualbox packstack-template.box 2>&1 >> log/template.log
-    rm -f packstack-template.box
-fi
-
 echo "$(date) brining up all VMs"
 run 2 up --no-provision