Hello community,
here is the log from the commit of package python-apache-libcloud for
openSUSE:Factory checked in at 2018-10-01 08:19:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-apache-libcloud (Old)
and /work/SRC/openSUSE:Factory/.python-apache-libcloud.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-apache-libcloud"
Mon Oct 1 08:19:51 2018 rev:23 rq:639065 version:2.3.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-apache-libcloud/python-apache-libcloud.changes
2018-08-18 00:04:52.015212508 +0200
+++
/work/SRC/openSUSE:Factory/.python-apache-libcloud.new/python-apache-libcloud.changes
2018-10-01 08:20:01.545867962 +0200
@@ -1,0 +2,6 @@
+Fri Sep 28 20:00:44 UTC 2018 - Sean Marlow <[email protected]>
+
+- Add ec2_create_node.patch to allow for instance type strings
+ in create_node method.
+
+-------------------------------------------------------------------
New:
----
ec2_create_node.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-apache-libcloud.spec ++++++
--- /var/tmp/diff_new_pack.Oo8eHc/_old 2018-10-01 08:20:02.645867262 +0200
+++ /var/tmp/diff_new_pack.Oo8eHc/_new 2018-10-01 08:20:02.645867262 +0200
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -26,6 +26,7 @@
URL: https://libcloud.apache.org
Source0:
https://files.pythonhosted.org/packages/source/a/apache-libcloud/apache-libcloud-%{version}.tar.gz
Patch1: image_projects.patch
+Patch2: ec2_create_node.patch
BuildRequires: %{python_module lxml}
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module xml}
@@ -48,6 +49,7 @@
%prep
%setup -q -n apache-libcloud-%{version}
%patch1 -p1
+%patch2 -p1
%build
%python_build
++++++ ec2_create_node.patch ++++++
Index: apache-libcloud-2.3.0/libcloud/compute/drivers/ec2.py
===================================================================
--- apache-libcloud-2.3.0.orig/libcloud/compute/drivers/ec2.py
+++ apache-libcloud-2.3.0/libcloud/compute/drivers/ec2.py
@@ -3907,12 +3907,18 @@ class BaseEC2NodeDriver(NodeDriver):
"""
image = kwargs["image"]
size = kwargs["size"]
+
+ try:
+ instance_type = size.id
+ except AttributeError:
+ instance_type = size
+
params = {
'Action': 'RunInstances',
'ImageId': image.id,
'MinCount': str(kwargs.get('ex_mincount', '1')),
'MaxCount': str(kwargs.get('ex_maxcount', '1')),
- 'InstanceType': size.id
+ 'InstanceType': instance_type
}
if kwargs.get("ex_terminate_on_shutdown", False):
