From f7ef4f3a91e8a40db3c6c47b1935a31d3ad9e6d6 Mon Sep 17 00:00:00 2001
From: Patrick Laurin <plaurin@inocybe.com>
Date: Wed, 25 Mar 2015 17:17:28 -0400
Subject: [PATCH] Moved vagrant inline scripts to external scripts inside a new
 script directory

Change-Id: Iff6471684f5d4a3e9eb91987ae7f0fa6318d0123
Signed-off-by: Patrick Laurin <plaurin@inocybe.com>
---
 test/tools/VM_Tool/Vagrantfile       | 25 +++++--------------------
 test/tools/VM_Tool/scripts/centos.sh | 13 +++++++++++++
 test/tools/VM_Tool/scripts/ubuntu.sh |  4 ++++
 3 files changed, 22 insertions(+), 20 deletions(-)
 create mode 100644 test/tools/VM_Tool/scripts/centos.sh
 create mode 100644 test/tools/VM_Tool/scripts/ubuntu.sh

diff --git a/test/tools/VM_Tool/Vagrantfile b/test/tools/VM_Tool/Vagrantfile
index 414eb2be9b..0899a00333 100644
--- a/test/tools/VM_Tool/Vagrantfile
+++ b/test/tools/VM_Tool/Vagrantfile
@@ -5,20 +5,6 @@
 $MEMORY = "2048"
 $CPU = "2"
 
-# Inline shell script for provisioning CentOS 7
-$centos_script = <<SCRIPT
-# Add EPEL repo for access to Puppet, git-review, etc.
-sudo yum install -y epel-release
-
-# Install other packages (must be done after EPEL repo add)
-sudo yum install -y \
-  puppet \
-  git \
-  git-review \
-  vim \
-  nano
-SCRIPT
-
 # Initial Vagrant configuration
 Vagrant.configure(2) do |config|
 
@@ -42,12 +28,8 @@ Vagrant.configure(2) do |config|
     centos.vm.hostname = "tools-centos"
     # Enable X11 SSH forwarding for GUI applications
     config.ssh.forward_x11 = "true"
-
     # Use shell provisioner to install additional packages
-    centos.vm.provision "shell" do |shell|
-      # Inline shell provisioning
-      shell.inline = $centos_script
-    end
+    centos.vm.provision "shell", path: "scripts/centos.sh"
 
     # Install OpenDaylight using its Puppet module
     centos.vm.provision "puppet" do |puppet|
@@ -71,7 +53,10 @@ Vagrant.configure(2) do |config|
     # Set hostname of box
     ubuntu.vm.hostname = "tools-ubuntu"
     # Enable X11 SSH forwarding for GUI applications
-    config.ssh.forward_x11 = "true"
+    ubuntu.ssh.forward_x11 = "true"
+    # Use shell provisioner to install additional packages
+    #ubuntu.vm.provision "shell", path: "scripts/ubuntu.sh"
+
     # VirtualBox configuration specific to this box
     ubuntu.vm.provider "virtualbox" do |vb|
       # Name of VirtualBox guest machine
diff --git a/test/tools/VM_Tool/scripts/centos.sh b/test/tools/VM_Tool/scripts/centos.sh
new file mode 100644
index 0000000000..02cdb07ac9
--- /dev/null
+++ b/test/tools/VM_Tool/scripts/centos.sh
@@ -0,0 +1,13 @@
+# External shell script for the vagrant shell provisioner
+# This applies for the CentOS VM
+
+# Add EPEL repo for access to Puppet, git-review, etc.
+sudo yum install -y epel-release
+
+# Install other packages (must be done after EPEL repo add)
+sudo yum install -y \
+  puppet \
+  git \
+  git-review \
+  vim \
+  nano
diff --git a/test/tools/VM_Tool/scripts/ubuntu.sh b/test/tools/VM_Tool/scripts/ubuntu.sh
new file mode 100644
index 0000000000..370e66caad
--- /dev/null
+++ b/test/tools/VM_Tool/scripts/ubuntu.sh
@@ -0,0 +1,4 @@
+# External shell script for the vagrant shell provisioner
+# This applies for the Ubuntu VM
+
+#TODO
-- 
2.36.6