aboutsummaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-06-08 14:50:35 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-06-08 14:50:35 +0000
commitf467b5b9b48d0f4a4a60b5c3907ea48de66bb21e (patch)
tree28e50efb7b056b1ba7ac849ad6957069a6a6a050 /patches/opnfv-fuel
parente452ec9d11db0a94f6c3221a3ab7682245fc893e (diff)
parent82369dc79d38e77ca3c2c86e7322b47ed4d1bd55 (diff)
Merge "Fuel deploy: timestamp for newly created images"
Diffstat (limited to 'patches/opnfv-fuel')
-rw-r--r--patches/opnfv-fuel/0030-deploy.py-add-a-time-stamp-to-the-new-ISO-image.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/0030-deploy.py-add-a-time-stamp-to-the-new-ISO-image.patch b/patches/opnfv-fuel/0030-deploy.py-add-a-time-stamp-to-the-new-ISO-image.patch
new file mode 100644
index 00000000..3e3480b1
--- /dev/null
+++ b/patches/opnfv-fuel/0030-deploy.py-add-a-time-stamp-to-the-new-ISO-image.patch
@@ -0,0 +1,39 @@
+From: Josep Puigdemont <josep.puigdemont@enea.com>
+Date: Tue, 17 May 2016 14:40:48 +0200
+Subject: [PATCH] deploy.py: add a time stamp to the new ISO image
+
+Add a time stamp to the newly create ISO image. This is to prevent name
+collisions with other ISO images from earlier deploy jobs.
+
+Ideally this will only be a temporary need, and releng will provide with
+unique IDs for each job that we can use to this effect.
+
+Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
+---
+ deploy/deploy.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/deploy/deploy.py b/deploy/deploy.py
+index 041ba2f..cebef97 100755
+--- a/deploy/deploy.py
++++ b/deploy/deploy.py
+@@ -13,6 +13,7 @@ import os
+ import io
+ import re
+ import sys
++import time
+ import yaml
+ import errno
+ import signal
+@@ -100,8 +101,9 @@ class AutoDeploy(object):
+
+ def install_fuel_master(self):
+ log('Install Fuel Master')
+- new_iso = ('%s/deploy-%s'
+- % (self.tmp_dir, os.path.basename(self.iso_file)))
++ stamp = time.strftime("%Y%m%d%H%M%S")
++ new_iso = ('%s/deploy-%s-%s'
++ % (self.tmp_dir, stamp, os.path.basename(self.iso_file)))
+ self.patch_iso(new_iso)
+ self.iso_file = new_iso
+ self.install_iso()