From 5d2466ac6a065d105df7950c18684b3fde3e0501 Mon Sep 17 00:00:00 2001
From: "alberto.colla" <alberto.colla@garr.it>
Date: Thu, 19 Aug 2021 10:57:35 +0000
Subject: [PATCH] 2021-08-19 AC: aligned to python3
---
generate-files-for-simplestream.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/generate-files-for-simplestream.py b/generate-files-for-simplestream.py
index e43c4ca..1b3ac64 100755
--- a/generate-files-for-simplestream.py
+++ b/generate-files-for-simplestream.py
@@ -10,8 +10,8 @@ import argparse
parser = argparse.ArgumentParser(description='Generate simplestreams metadata')
-parser.add_argument('-r','--regions', nargs='+', help='List of regions: e.g. garr-ct1 garr-pa1 garr-na. default=[\'garr-ct1\', \'garr-pa1\', \'garr-na\']', default=garr-ct1, garr-pa1, garr-na, required=False)
-parser.add_argument('-k','--keystone', help='Keystone endpoint: e.g. https://keystone.cloud.garr.it:5000/v3. default="https://keystone.cloud.garr.it:5000/v3"', default="https://keystone.cloud.garr.it:5000/v3", required=False)
+parser.add_argument('-r','--regions', nargs='+', help='List of regions: e.g. -r garr-ct1 garr-pa1 garr-na \ndefault=garr-ct1 garr-pa1 garr-na', default=['garr-ct1', 'garr-pa1', 'garr-na'], required=False)
+parser.add_argument('-k','--keystone', help='Keystone endpoint: e.g. https://keystone.cloud.garr.it:5000/v3 default="https://keystone.cloud.garr.it:5000/v3"', default="https://keystone.cloud.garr.it:5000/v3", required=False)
@@ -27,7 +27,7 @@ print("KEYSTONE_ENDPOINT=",KEYSTONE_ENDPOINT)
config = None
with open('config.yml') as fh_config:
- config = yaml.full_load(fh_config)
+ config = yaml.safe_load(fh_config)
fh_config.close()
# create the output directory
@@ -98,7 +98,7 @@ with open(OUTPUT_DIR + "com.ubuntu.cloud-released-imagemetadata.json", 'w') as m
print("\n\nThe simplestream files have been generated in the output directory.\nYou can now upload them to the object store:")
-print("\n\n cd output/simplestreams")
-print("\n\n swift upload simplestreams .")
+print("\n\n$ cd output/simplestreams")
+print("$ swift upload simplestreams .")
--
GitLab