From 6216f40a34f49eacb7ceced9e13a976b10f600b8 Mon Sep 17 00:00:00 2001
From: Roger Luethi <rl@patchworkscience.org>
Date: Tue, 19 Aug 2014 20:03:52 +0200
Subject: [PATCH] labs: skip osbash scripts in Vagrant

Make Vagrant skip not only osbash commands (lines starting with "cmd "),
but also scripts in the osbash directory. This allows us to use the same
config/scripts.* files for osbash and Vagrant while preventing Vagrant
from executing scripts that are only meant for osbash.

Change-Id: I86d1bb6065a58edcc67015603da59af9d6aff4c7
Implements: blueprint openstack-training-labs
---
 labs/scripts/vagrant/run_scripts.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/labs/scripts/vagrant/run_scripts.sh b/labs/scripts/vagrant/run_scripts.sh
index 3f1e37f4..bd5e241f 100755
--- a/labs/scripts/vagrant/run_scripts.sh
+++ b/labs/scripts/vagrant/run_scripts.sh
@@ -24,8 +24,8 @@ function vagrant_start_from_config {
         if [[ $field_1 =~ ^# ]]; then
             # Skip lines that are commented out
             continue
-        elif [[ "$field_1" = cmd ]]; then
-            # Skip osbash commands, Vagrant ignores them
+        elif [[ "$field_1" = cmd || "$field_1" = osbash ]]; then
+            # Skip osbash commands and scripts for Vagrant
             continue
         else
             local dir="$(src_dir_code_to_dir "$field_1")"