commit python3-ec2uploadimg for openSUSE:Factory
Hello community,
here is the log from the commit of package python3-ec2uploadimg for
openSUSE:Factory checked in at 2018-02-24 16:39:27
Comparing /work/SRC/openSUSE:Factory/python3-ec2uploadimg (Old)
and /work/SRC/openSUSE:Factory/.python3-ec2uploadimg.new (New)
Package is "python3-ec2uploadimg"
Sat Feb 24 16:39:27 2018 rev:4 rq:579662 version:6.0.1
Changes:
---
/work/SRC/openSUSE:Factory/python3-ec2uploadimg/python3-ec2uploadimg.changes
2018-02-06 16:49:31.987004432 +0100
+++
/work/SRC/openSUSE:Factory/.python3-ec2uploadimg.new/python3-ec2uploadimg.changes
2018-02-24 16:39:34.257036156 +0100
@@ -1,0 +2,7 @@
+Fri Feb 23 20:55:56 UTC 2018 - rjsch...@suse.com
+
+- Update to version 6.0.1
+ + Create a security group if necessary in the proper VPC
+ + Read the security group to use form the configuration file
+
+---
Old:
ec2uploadimg-6.0.0.tar.bz2
New:
ec2uploadimg-6.0.1.tar.bz2
Other differences:
--
++ python3-ec2uploadimg.spec ++
--- /var/tmp/diff_new_pack.0YFhzI/_old 2018-02-24 16:39:34.933011829 +0100
+++ /var/tmp/diff_new_pack.0YFhzI/_new 2018-02-24 16:39:34.937011685 +0100
@@ -18,10 +18,10 @@
%define upstream_name ec2uploadimg
Name: python3-ec2uploadimg
-Version:6.0.0
+Version:6.0.1
Release:0
Summary:Upload an image to EC2
-License:GPL-3.0+
+License:GPL-3.0-or-later
Group: System/Management
Url:https://github.com/SUSE/Enceladus
Source0:%{upstream_name}-%{version}.tar.bz2
++ ec2uploadimg-6.0.0.tar.bz2 -> ec2uploadimg-6.0.1.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ec2uploadimg-6.0.0/ec2uploadimg
new/ec2uploadimg-6.0.1/ec2uploadimg
--- old/ec2uploadimg-6.0.0/ec2uploadimg 2018-02-05 22:13:08.980943110 +0100
+++ new/ec2uploadimg-6.0.1/ec2uploadimg 2018-02-23 21:18:01.023244439 +0100
@@ -236,8 +236,8 @@
dest='version',
help='Program version'
)
-help_msg = 'The ID of the VPC subnet in which the helper instance should '
-help_msg += 'run (Optional)'
+help_msg = 'The ID, starts with "subnet-" of the VPC subnet in which the '
+help_msg += 'helper instance should run (Optional)'
argparse.add_argument(
'--vpc-subnet-id',
default='',
@@ -374,7 +374,7 @@
region,
'ami',
'--ec2-ami')
-except:
+except Exception:
print('Could not determine helper AMI-ID', file=sys.stderr)
sys.exit(1)
bootkernel = args.akiID
@@ -389,7 +389,7 @@
region,
'g2_aki_x86_64',
'--boot-kernel')
-except:
+except Exception:
print(
'Could not find bootkernel in config',
file=sys.stderr
@@ -402,7 +402,7 @@
region,
'aki_x86_64',
'--boot-kernel')
-except:
+except Exception:
print(
'Could not find bootkernel in config',
file=sys.stderr
@@ -415,7 +415,7 @@
region,
'aki_i386',
'--boot-kernel')
-except:
+except Exception:
print(
'Could not find bootkernel in config',
file=sys.stderr
@@ -428,7 +428,11 @@
file=sys.stderr
)
print('bootkernel to use ', file=sys.stderr)
-print('must specify bootkernel, ', end=' ',
file=sys.stderr)
+print(
+'must specify bootkernel, ',
+end=' ',
+file=sys.stderr
+)
print('arch (x86_64|i386) or hvm', file=sys.stderr)
sys.exit(1)
@@ -443,10 +447,10 @@
key_pair_name = args.sshName
ssh_private_key
commit python3-ec2uploadimg for openSUSE:Factory
Hello community,
here is the log from the commit of package python3-ec2uploadimg for
openSUSE:Factory checked in at 2018-02-06 16:49:30
Comparing /work/SRC/openSUSE:Factory/python3-ec2uploadimg (Old)
and /work/SRC/openSUSE:Factory/.python3-ec2uploadimg.new (New)
Package is "python3-ec2uploadimg"
Tue Feb 6 16:49:30 2018 rev:3 rq:573155 version:6.0.0
Changes:
---
/work/SRC/openSUSE:Factory/python3-ec2uploadimg/python3-ec2uploadimg.changes
2017-09-13 22:36:56.639782421 +0200
+++
/work/SRC/openSUSE:Factory/.python3-ec2uploadimg.new/python3-ec2uploadimg.changes
2018-02-06 16:49:31.987004432 +0100
@@ -1,0 +2,9 @@
+Mon Feb 5 21:14:21 UTC 2018 - rjsch...@suse.com
+
+- Update to version 6.0.0
+ + Incompatible changes, additional constructor arguments
+ + Update to handle preparation of a given cloud account for
+image uploading by creating temporary artifacts as needed
+~ This is in support of EC2 upload from OBS
+
+---
Old:
ec2uploadimg-5.0.1.tar.bz2
New:
ec2uploadimg-6.0.0.tar.bz2
Other differences:
--
++ python3-ec2uploadimg.spec ++
--- /var/tmp/diff_new_pack.nqI13B/_old 2018-02-06 16:49:32.622974674 +0100
+++ /var/tmp/diff_new_pack.nqI13B/_new 2018-02-06 16:49:32.622974674 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python3-ec2uploadimg
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,18 +18,22 @@
%define upstream_name ec2uploadimg
Name: python3-ec2uploadimg
-Version:5.0.1
+Version:6.0.0
Release:0
Summary:Upload an image to EC2
License:GPL-3.0+
Group: System/Management
Url:https://github.com/SUSE/Enceladus
Source0:%{upstream_name}-%{version}.tar.bz2
-Requires: python-ec2utilsbase < 4.0.0
-Requires: python-ec2utilsbase >= 3.0.0
Requires: python3
Requires: python3-boto3>= 1.4.1
+Requires: python3-ec2utilsbase < 4.0.0
+Requires: python3-ec2utilsbase >= 3.1.0
Requires: python3-paramiko
+BuildRequires: python3-boto3>= 1.4.1
+BuildRequires: python3-ec2utilsbase < 4.0.0
+BuildRequires: python3-ec2utilsbase >= 3.1.0
+BuildRequires: python3-paramiko
BuildRequires: python3-setuptools
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
++ ec2uploadimg-5.0.1.tar.bz2 -> ec2uploadimg-6.0.0.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ec2uploadimg-5.0.1/Makefile
new/ec2uploadimg-6.0.0/Makefile
--- old/ec2uploadimg-5.0.1/Makefile 2017-09-12 16:51:20.472834548 +0200
+++ new/ec2uploadimg-6.0.0/Makefile 2018-02-05 22:13:08.964943447 +0100
@@ -12,6 +12,15 @@
$(error "Version mismatch, will not take any action")
endif
+clean:
+ @find . -name "*.pyc" | xargs rm -f
+ @find . -name "__pycache__" | xargs rm -rf
+ @find . -name "*.cache" | xargs rm -rf
+ @find . -name "*.egg-info" | xargs rm -rf
+
+pep8: clean
+ @pep8 -v --statistics lib/ec2utils/*
+
tar:
mkdir -p "$(NAME)-$(verSrc)"/man/man1
cp -r $(dirs) $(files) "$(NAME)-$(verSrc)"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ec2uploadimg-5.0.1/ec2uploadimg
new/ec2uploadimg-6.0.0/ec2uploadimg
--- old/ec2uploadimg-5.0.1/ec2uploadimg 2017-09-12 16:51:20.472834548 +0200
+++ new/ec2uploadimg-6.0.0/ec2uploadimg 2018-02-05 22:13:08.980943110 +0100
@@ -26,6 +26,7 @@
import ec2utils.ec2utilsutils as utils
import ec2utils.ec2uploadimg as ec2upimg
from ec2utils.ec2UtilsExceptions import *
+from ec2utils.ec2setup import EC2Setup
# Set up command line argument parsing
argparse = argparse.ArgumentParser(description='Upload image to Amazon EC2')
@@ -155,6 +156,12 @@
metavar='AWS_SECURITY_GROUP_IDS'
)
argparse.add_argument(
+'--session-token',
+dest='sessionToken',
+help='AWS session token, for use of temporary credentials (Optional)',
+metavar='AWS_SESSION_TOKEN'
+)
+argparse.add_argument(
'--snaponly',
action='store_true',
default=False,
@@ -339,9 +346,9 @@
regions = args.regions.split(',')
if (
-len(regions) > 1
-and (args.amiID or args.akiID or args.runningID or args.vpcSubnetId)
-):
+len(regions) > 1 and (args.amiID or args.akiID or args.runningID or
+ args.vpcSubnetId)
+ ):
print(
'Incompatible arguments: multiple regions specified
commit python3-ec2uploadimg for openSUSE:Factory
Hello community,
here is the log from the commit of package python3-ec2uploadimg for
openSUSE:Factory checked in at 2017-09-13 22:36:36
Comparing /work/SRC/openSUSE:Factory/python3-ec2uploadimg (Old)
and /work/SRC/openSUSE:Factory/.python3-ec2uploadimg.new (New)
Package is "python3-ec2uploadimg"
Wed Sep 13 22:36:36 2017 rev:2 rq:523775 version:5.0.1
Changes:
---
/work/SRC/openSUSE:Factory/python3-ec2uploadimg/python3-ec2uploadimg.changes
2017-08-24 18:49:15.587940625 +0200
+++
/work/SRC/openSUSE:Factory/.python3-ec2uploadimg.new/python3-ec2uploadimg.changes
2017-09-13 22:36:56.639782421 +0200
@@ -1,0 +2,8 @@
+Tue Sep 12 18:01:51 UTC 2017 - rjsch...@suse.com
+
+- Update to version 5.0.1
+ + Add support for billing code addition during registration
+~ Introduces incompatibility in API
+ + Read VPC subnet information from ec2utils.conf
+
+---
Old:
ec2uploadimg-4.0.0.tar.bz2
New:
ec2uploadimg-5.0.1.tar.bz2
Other differences:
--
++ python3-ec2uploadimg.spec ++
--- /var/tmp/diff_new_pack.4d2LJr/_old 2017-09-13 22:36:57.167708091 +0200
+++ /var/tmp/diff_new_pack.4d2LJr/_new 2017-09-13 22:36:57.171707527 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package python-ec2uploadimg
+# spec file for package python3-ec2uploadimg
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,17 +18,17 @@
%define upstream_name ec2uploadimg
Name: python3-ec2uploadimg
-Version:4.0.0
+Version:5.0.1
Release:0
Summary:Upload an image to EC2
License:GPL-3.0+
Group: System/Management
Url:https://github.com/SUSE/Enceladus
Source0:%{upstream_name}-%{version}.tar.bz2
+Requires: python-ec2utilsbase < 4.0.0
+Requires: python-ec2utilsbase >= 3.0.0
Requires: python3
Requires: python3-boto3>= 1.4.1
-Requires: python-ec2utilsbase >= 3.0.0
-Requires: python-ec2utilsbase < 4.0.0
Requires: python3-paramiko
BuildRequires: python3-setuptools
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++ ec2uploadimg-4.0.0.tar.bz2 -> ec2uploadimg-5.0.1.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ec2uploadimg-4.0.0/ec2uploadimg
new/ec2uploadimg-5.0.1/ec2uploadimg
--- old/ec2uploadimg-4.0.0/ec2uploadimg 2017-08-09 17:33:16.882810570 +0200
+++ new/ec2uploadimg-5.0.1/ec2uploadimg 2017-09-12 16:51:20.472834548 +0200
@@ -49,6 +49,12 @@
metavar='EC2_BACKING_STORE'
)
argparse.add_argument(
+'--billing-codes',
+dest='billingCodes',
+help='The BillingProduct codes, only available to some accounts',
+metavar='BILLING_CODES'
+)
+argparse.add_argument(
'--boot-kernel',
dest='akiID',
help='AWS kernel ID (aki) to boot the new image (Optional)',
@@ -256,6 +262,7 @@
if not os.path.isfile(config_file):
print('Configuration file "%s" not found.' % config_file)
sys.exit(1)
+
try:
config = utils.get_config(config_file)
except Exception as e:
@@ -331,7 +338,10 @@
root_volume_size = args.rootVolSize
regions = args.regions.split(',')
-if len(regions) > 1 and (args.amiID or args.akiID or args.runningID):
+if (
+len(regions) > 1
+and (args.amiID or args.akiID or args.runningID or args.vpcSubnetId)
+):
print(
'Incompatible arguments: multiple regions specified',
file=sys.stderr
@@ -403,7 +413,7 @@
sys.exit(1)
else:
print(
-'Could not reliable determine the ',
+'Could not reliably determine the ',
end=' ',
file=sys.stderr
)
@@ -468,9 +478,30 @@
print('Could not determin ssh user to use', file=sys.stderr)
sys.exit(1)
+vpc_subnet_id = args.vpcSubnetId
+if not vpc_subnet_id and not (args.amiID or args.runningID):
+# Depending on instance type an instance may possibly only
+# launch inside a subnet. Look in the config for a subnet if none
+# is given and the AMI to use was not specified on the command line
+try:
+vpc_subnet_id = utils.get_from_config(args.accountName,
+ config,
+ region,
+
