[cloudstack] branch debian9-systemvmtemplate updated: More fixes

[bh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch debian9-systemvmtemplate
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/debian9-systemvmtemplate by this push:
     new 9d2c7d3  More fixes
9d2c7d3 is described below

commit 9d2c7d3d17623d7b0e38e3163d1096f8e47e1f19
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Mon Dec 4 13:12:44 2017 +0530

    More fixes
    
    Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
---
 systemvm/patches/debian/opt/cloud/bin/update_config.py | 7 +++++++
 tools/travis/install.sh                                | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/systemvm/patches/debian/opt/cloud/bin/update_config.py b/systemvm/patches/debian/opt/cloud/bin/update_config.py
index 7b86378..a603f47 100755
--- a/systemvm/patches/debian/opt/cloud/bin/update_config.py
+++ b/systemvm/patches/debian/opt/cloud/bin/update_config.py
@@ -39,6 +39,13 @@ jsonFilename = sys.argv[1]
 jsonConfigFile = jsonPath % jsonFilename
 currentGuestNetConfig = "/etc/cloudstack/guestnetwork.json"
 
+# If the command line json file is unprocessed process it
+# This is important or, the control interfaces will get deleted!
+if os.path.isfile(jsonPath % "cmd_line.json"):
+    qf = QueueFile()
+    qf.setFile("cmd_line.json")
+    qf.load(None)
+
 
 def finish_config():
     # Converge
diff --git a/tools/travis/install.sh b/tools/travis/install.sh
index f1ef4f1..6744979 100755
--- a/tools/travis/install.sh
+++ b/tools/travis/install.sh
@@ -26,7 +26,7 @@ set -e
 
 if [ $TEST_SEQUENCE_NUMBER -eq 1 ]; then
    # Pylint/pep8 systemvm python codebase
-   cd systemvm/test && bash -x runtests.sh && cd ..
+   cd systemvm/test && bash -x runtests.sh && cd ../..
    # Build noredist
    git clone https://github.com/rhtyd/cloudstack-nonoss.git nonoss
    cd nonoss && bash -x install-non-oss.sh && cd ..

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>'].