From a68600fc6c3389a1d8ad75c9754ace0bb10673e6 Mon Sep 17 00:00:00 2001
From: Kyle Mestery <mestery@mestery.com>
Date: Wed, 25 Nov 2015 09:43:03 -0600
Subject: [PATCH] Integrate devstack plugin with Vagrant setup

This integrates the freshly added devstack plugin with the Kuryr
Vagrant setup.

Also cleans up a few nits found while here in plugin.sh

Change-Id: I5de55e7d6415d4bffe8bb7a2b2e5e15188815c36
Signed-off-by: Kyle Mestery <mestery@mestery.com>
---
 .gitignore                       |  2 ++
 contrib/vagrant/Vagrantfile      |  2 ++
 contrib/vagrant/config/localrc   | 29 -----------------------------
 contrib/vagrant/devstack.sh      |  8 +++-----
 contrib/vagrant/docker.sh        |  2 --
 contrib/vagrant/install_kuryr.sh | 10 ----------
 contrib/vagrant/vagrant.sh       |  7 -------
 devstack/local.conf.sample       |  3 +++
 devstack/plugin.sh               |  3 +++
 9 files changed, 13 insertions(+), 53 deletions(-)
 delete mode 100644 contrib/vagrant/config/localrc
 delete mode 100755 contrib/vagrant/docker.sh
 delete mode 100755 contrib/vagrant/install_kuryr.sh

diff --git a/.gitignore b/.gitignore
index f8c7e3c0..205ded5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,5 @@ ChangeLog
 !/.mailmap
 !/.pylintrc
 !/.testr.conf
+
+contrib/vagrant/.vagrant
diff --git a/contrib/vagrant/Vagrantfile b/contrib/vagrant/Vagrantfile
index 61c91723..6c3418ee 100644
--- a/contrib/vagrant/Vagrantfile
+++ b/contrib/vagrant/Vagrantfile
@@ -20,6 +20,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     v.customize ["set", :id, "--nested-virt", "on"]
   end
 
+  config.vm.synced_folder "../../devstack/", "/vagrant/devstack"
+
   config.vm.provision :shell, :path => "vagrant.sh"
 
   if Vagrant.has_plugin?("vagrant-cachier")
diff --git a/contrib/vagrant/config/localrc b/contrib/vagrant/config/localrc
deleted file mode 100644
index 80ec2a2b..00000000
--- a/contrib/vagrant/config/localrc
+++ /dev/null
@@ -1,29 +0,0 @@
-OFFLINE=No
-RECLONE=No
-# Credentials
-ADMIN_PASSWORD=pass
-DATABASE_PASSWORD=pass
-RABBIT_PASSWORD=pass
-SERVICE_PASSWORD=pass
-SERVICE_TOKEN=pass
-HOST_IP=127.0.0.1
-ENABLED_SERVICES=True
-# Ensure we are using neutron networking rather than nova networking
-# (Neutron is enabled by default since Kilo)
-disable_service n-net
-enable_service q-svc
-enable_service q-agt
-enable_service q-dhcp
-enable_service q-l3
-enable_service q-meta
-enable_service neutron
-enable_service key
-enable_service mysql
-enable_service rabbit
-
-# Log all output to files
-LOGFILE=$HOME/devstack.log
-SCREEN_LOGDIR=$HOME/logs
-
-
-
diff --git a/contrib/vagrant/devstack.sh b/contrib/vagrant/devstack.sh
index 13a92c5f..9d0d03b0 100755
--- a/contrib/vagrant/devstack.sh
+++ b/contrib/vagrant/devstack.sh
@@ -22,14 +22,12 @@ then
 
   echo "Copy configuration"
 
-  # copy localrc settings (source: devstack/samples/localrc)
-  echo "copy config from $BASHPATH/config/localrc to $DEVSTACK/localrc"
-  cp "$BASHPATH"/config/localrc "$DEVSTACK"/localrc
-  chown "$OS_USER":"$OS_USER" "$DEVSTACK"/localrc
+  # copy local.conf.sample settings (source: kuryr/devstack/local.conf.sample)
+  cp /vagrant/devstack/local.conf.sample $DEVSTACK/local.conf
+  chown "$OS_USER":"$OS_USER" "$DEVSTACK"/local.conf
 
 fi
 
-
 # start devstack
 echo "Start Devstack"
 su "$OS_USER" -c "cd $DEVSTACK && ./stack.sh"
diff --git a/contrib/vagrant/docker.sh b/contrib/vagrant/docker.sh
deleted file mode 100755
index cbc4aa03..00000000
--- a/contrib/vagrant/docker.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-su "$OS_USER" -c "curl -sSL https://test.docker.com/ | sh"
diff --git a/contrib/vagrant/install_kuryr.sh b/contrib/vagrant/install_kuryr.sh
deleted file mode 100755
index 99eeb8f1..00000000
--- a/contrib/vagrant/install_kuryr.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-echo "running apt-get install python-pip"
-sudo apt-get install -qqy python-pip
-echo "running git clone kuryr"
-
-su "$OS_USER" -c "cd ~ && git clone -b master https://github.com/openstack/kuryr"
-su "$OS_USER" -c "cd ~/kuryr && sudo pip install -r requirements.txt"
-
-
diff --git a/contrib/vagrant/vagrant.sh b/contrib/vagrant/vagrant.sh
index 192335b0..3f744e62 100755
--- a/contrib/vagrant/vagrant.sh
+++ b/contrib/vagrant/vagrant.sh
@@ -6,12 +6,5 @@ export OS_HOST_IP=172.68.5.10
 # run script
 sh /vagrant/devstack.sh
 
-# install experimetal docker
-sh /vagrant/docker.sh
-
-#install kuryr
-sh /vagrant/install_kuryr.sh
-
 #set environment variables for kuryr
 su "$OS_USER" -c "echo 'source /vagrant/config/kuryr_rc' >> ~/.bashrc"
-
diff --git a/devstack/local.conf.sample b/devstack/local.conf.sample
index 1df66b71..6d746347 100644
--- a/devstack/local.conf.sample
+++ b/devstack/local.conf.sample
@@ -1,5 +1,8 @@
 [[local|localrc]]
 
+LOGFILE=stack.sh.log
+LOG_COLOR=False
+
 DATABASE_PASSWORD=pass
 RABBIT_PASSWORD=pass
 SERVICE_PASSWORD=pass
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 69748ed4..4d42cfa9 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -11,6 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+# Save trace setting
+XTRACE=$(set +o | grep xtrace)
+set +o xtrace
 
 function install_etcd_data_store {