This is an automated email from the ASF dual-hosted git repository.
rohit 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 507f732 more fixes
507f732 is described below
commit 507f732ed9571bf6d5ccc5d7efbc21fc05920257
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Mon Dec 11 16:48:01 2017 +0530
more fixes
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
---
systemvm/debian/opt/cloud/bin/update_config.py | 7 -------
test/integration/smoke/test_templates.py | 4 ++--
tools/appliance/definitions/systemvmtemplate/preseed.cfg | 4 ++--
3 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/systemvm/debian/opt/cloud/bin/update_config.py
b/systemvm/debian/opt/cloud/bin/update_config.py
index a603f47..7b86378 100755
--- a/systemvm/debian/opt/cloud/bin/update_config.py
+++ b/systemvm/debian/opt/cloud/bin/update_config.py
@@ -39,13 +39,6 @@ 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/test/integration/smoke/test_templates.py
b/test/integration/smoke/test_templates.py
index 955fe6e..6544ad2 100644
--- a/test/integration/smoke/test_templates.py
+++ b/test/integration/smoke/test_templates.py
@@ -158,7 +158,6 @@ class TestCreateTemplateWithChecksum(cloudstackTestCase):
cmd.id = temp.id
cmd.zoneid = self.zone.id
self.apiclient.deleteTemplate(cmd)
-
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -227,7 +226,8 @@ class TestCreateTemplateWithChecksum(cloudstackTestCase):
def registerTemplate(self, cmd):
temp = self.apiclient.registerTemplate(cmd)[0]
- self.cleanup.append(temp)
+ if not temp:
+ self.cleanup.append(temp)
return temp
def getOsType(self, param):
diff --git a/tools/appliance/definitions/systemvmtemplate/preseed.cfg
b/tools/appliance/definitions/systemvmtemplate/preseed.cfg
index 7fbe2a1..9f8d988 100644
--- a/tools/appliance/definitions/systemvmtemplate/preseed.cfg
+++ b/tools/appliance/definitions/systemvmtemplate/preseed.cfg
@@ -57,7 +57,7 @@ d-i partman-auto/method string regular
d-i partman-auto/choose_recipe select atomic
d-i partman-auto/expert_recipe string \
boot-root :: \
- 100 50 100 ext2 \
+ 50 50 100 ext2 \
$primary{ } $bootable{ } \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext2 } \
@@ -73,7 +73,7 @@ d-i partman-auto/expert_recipe string
\
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /var/log } \
. \
- 50 100 200 linux-swap \
+ 100 100 200 linux-swap \
method{ swap } format{ } \
.
--
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <commits@cloudstack.apache.org>'].
