From: Dmitry Burmistrov Date: Thu, 3 Apr 2014 18:11:59 +0000 (+0400) Subject: Update specs to v. 2014.1.rc1 X-Git-Tag: 2014.1~2 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d24b87934fdba98a1b1902e96baa5adfbe9346fe;p=openstack-build%2Fheat-build.git Update specs to v. 2014.1.rc1 Change-Id: I9d030e88504290d1c711972eaab665e03586b655 --- diff --git a/debian/changelog b/debian/changelog index 1df33636..37e99bcd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,32 @@ -heat (2014.1~b2-0ubuntu1~cloud0) precise-icehouse; urgency=low +heat (2014.1~rc1-0ubuntu1~cloud0) precise-icehouse; urgency=medium - * New upstream release for the Ubuntu Cloud Archive. + * New update for the Ubuntu Cloud Archive. - -- Openstack Ubuntu Testing Bot Mon, 27 Jan 2014 04:08:50 -0500 + -- Openstack Ubuntu Testing Bot Tue, 01 Apr 2014 00:10:11 -0400 + +heat (2014.1~rc1-0ubuntu1) trusty; urgency=medium + + * New upstream release (LP: #1299055) + * debian/patches/use-oslo.sphinx-namespace.patch: Dropped no longer + needed. + * debian/control: Rename python-oslo.sphinx to python-oslosphinx. + + -- Chuck Short Mon, 31 Mar 2014 21:36:06 -0400 + +heat (2014.1~b3-0ubuntu1) trusty; urgency=medium + + [ Chuck Short ] + * New upstream release. + * debian/patches/adjust-dependencies.patch: Dropped no longer needed. + * debian/control: Add python-troveclient. + * debian/rules: fail to build if testsuite fails. + * debian/patches/use-oslo.sphinx-namespace.patch: Use oslo.sphinx namespace. + + [ Adam Gandelman ] + * debian/heat-engine.install: Install /etc/heat/environment.d/*. + (LP: #1285875). + + -- Chuck Short Thu, 06 Mar 2014 17:18:51 -0500 heat (2014.1~b2-0ubuntu1) trusty; urgency=low diff --git a/debian/control b/debian/control index e4e2fd93..11f74524 100644 --- a/debian/control +++ b/debian/control @@ -38,7 +38,7 @@ Build-Depends-Indep: python-neutronclient (>= 1:2.2.0), python-novaclient, python-oslo.config, - python-oslo.sphinx, + python-oslosphinx, python-paramiko, python-paste, python-pastedeploy, @@ -52,6 +52,7 @@ Build-Depends-Indep: python-testrepository (>= 0.0.13), python-testscenarios, python-testtools (>= 0.9.29), + python-troveclient, python-webob (>= 1.2.3), python-yaml, testrepository (>= 0.0.13) diff --git a/debian/heat-engine.install b/debian/heat-engine.install index 20db4659..7309b8b5 100644 --- a/debian/heat-engine.install +++ b/debian/heat-engine.install @@ -1 +1,2 @@ usr/bin/heat-engine +etc/heat/environment.d diff --git a/debian/patches/adjust-dependencies.patch b/debian/patches/adjust-dependencies.patch deleted file mode 100644 index c7eb6343..00000000 --- a/debian/patches/adjust-dependencies.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: Adjust dependencies for trusty. -Author: Chuck Short -Forwarded: no -diff --git a/requirements.txt b/requirements.txt -index 11fb75d..5f0b031 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -14,8 +14,8 @@ python-novaclient>=2.15.0 - PasteDeploy>=1.5.0 - requests>=1.1 - Routes>=1.12.3 --SQLAlchemy>=0.7.8,<=0.7.99 --WebOb>=1.2.3,<1.3 -+SQLAlchemy>=0.7.8,<=0.8.99 -+WebOb>=1.2.3 - python-heatclient>=0.2.3 - python-keystoneclient>=0.4.1 - python-swiftclient>=1.5 - diff --git a/debian/patches/series b/debian/patches/series index fa7c1167..2b6b02c4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1 @@ default-sqlite.patch -adjust-dependencies.patch -skip-tests.patch diff --git a/debian/rules b/debian/rules index 1585fb4e..93347fbc 100755 --- a/debian/rules +++ b/debian/rules @@ -7,7 +7,7 @@ ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) override_dh_auto_test: - PYTHONPATH=. ./run_tests.sh -u --concurrency=1 || true + PYTHONPATH=. testr init && testr run endif override_dh_clean: diff --git a/rpm/SOURCES/0001-Switch-to-using-M2Crypto.patch b/rpm/SOURCES/0001-Switch-to-using-M2Crypto.patch index 44e87f29..156622dd 100644 --- a/rpm/SOURCES/0001-Switch-to-using-M2Crypto.patch +++ b/rpm/SOURCES/0001-Switch-to-using-M2Crypto.patch @@ -1,20 +1,20 @@ -From a5963d7cf88c87285c724d3da81299359efb8d22 Mon Sep 17 00:00:00 2001 +From 738b1a510df9bad9910176c3756fc308f383f199 Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Wed, 8 May 2013 12:27:35 -0400 -Subject: [PATCH] Switch to using M2Crypto +Subject: [PATCH 1/3] Switch to using M2Crypto This patch uses M2Crypto instead of PyCrypto to perform encryption and decryption of user authentication information. --- - heat/common/crypt.py | 32 ++++++++++++++------------------ - requirements.txt | 2 +- + heat/common/crypt.py | 32 ++++++++++++++------------------ + requirements.txt | 2 +- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/heat/common/crypt.py b/heat/common/crypt.py -index 8d27617..aa5f7ea 100644 +index c87678f..b3fdd45 100644 --- a/heat/common/crypt.py +++ b/heat/common/crypt.py -@@ -14,10 +14,11 @@ +@@ -13,10 +13,11 @@ # under the License. import base64 @@ -28,7 +28,7 @@ index 8d27617..aa5f7ea 100644 from heat.openstack.common import log as logging -@@ -35,19 +36,12 @@ logger = logging.getLogger(__name__) +@@ -34,19 +35,12 @@ logger = logging.getLogger(__name__) def encrypt(auth_info): if auth_info is None: return None, None @@ -54,7 +54,7 @@ index 8d27617..aa5f7ea 100644 def heat_decrypt(auth_info): """Decrypt function for data that has been encrypted using an older -@@ -61,7 +55,9 @@ def heat_decrypt(auth_info): +@@ -60,7 +54,9 @@ def heat_decrypt(auth_info): if auth_info is None: return None auth = base64.b64decode(auth_info) @@ -68,13 +68,16 @@ index 8d27617..aa5f7ea 100644 + res = cipher.update(auth[16:]) + cipher.final() return res diff --git a/requirements.txt b/requirements.txt -index 11fb75d..969bbb4 100644 +index 8b41238..541dbdd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ - pbr>=0.5.21,<1.0 + pbr>=0.6,<1.0 -pycrypto>=2.6 +M2Crypto eventlet>=0.13.0 greenlet>=0.3.2 - httplib2 + httplib2>=0.7.5 +-- +1.7.9.5 + diff --git a/rpm/SOURCES/0002-remove-pbr-runtime-dependency.patch b/rpm/SOURCES/0002-remove-pbr-runtime-dependency.patch index 1b47452d..2539ac91 100644 --- a/rpm/SOURCES/0002-remove-pbr-runtime-dependency.patch +++ b/rpm/SOURCES/0002-remove-pbr-runtime-dependency.patch @@ -1,17 +1,17 @@ -From b880a01e8de36cfa7fddf184995656b163f75832 Mon Sep 17 00:00:00 2001 +From dc7a36234ac6f7bbb219b7bfeeed11c69a133cd3 Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Mon, 14 Oct 2013 14:30:34 -0400 -Subject: [PATCH] remove pbr runtime dependency +Subject: [PATCH 2/3] remove pbr runtime dependency --- - heat/version.py | 12 ++++++++++-- + heat/version.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/heat/version.py b/heat/version.py -index a717606..8ea213a 100644 +index 4a2b021..0758e7e 100644 --- a/heat/version.py +++ b/heat/version.py -@@ -14,6 +14,14 @@ +@@ -13,6 +13,14 @@ # under the License. @@ -28,3 +28,6 @@ index a717606..8ea213a 100644 + return self.release + +version_info = VersionInfo() +-- +1.7.9.5 + diff --git a/rpm/SOURCES/0003-Adjust-to-handle-parallel-installed-packages.patch b/rpm/SOURCES/0003-Adjust-to-handle-parallel-installed-packages.patch index 3649ab54..f51707f1 100644 --- a/rpm/SOURCES/0003-Adjust-to-handle-parallel-installed-packages.patch +++ b/rpm/SOURCES/0003-Adjust-to-handle-parallel-installed-packages.patch @@ -1,17 +1,17 @@ -From 24d4b6026f43270c74305eb263562a627117a528 Mon Sep 17 00:00:00 2001 +From d2f32dcb8afb749985ad649d00167d834047274f Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Tue, 2 Apr 2013 18:08:48 -0400 -Subject: [PATCH] Adjust to handle parallel installed packages +Subject: [PATCH 3/3] Adjust to handle parallel installed packages --- - heat/__init__.py | 33 +++++++++++++++++++++++++++++++++ + heat/__init__.py | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/heat/__init__.py b/heat/__init__.py -index 57e2d0f..d9df4ce 100644 +index 2e9772b..3bc3ac8 100644 --- a/heat/__init__.py +++ b/heat/__init__.py -@@ -19,3 +19,36 @@ from heat.openstack.common import gettextutils +@@ -18,3 +18,36 @@ from heat.openstack.common import gettextutils gettextutils.install('heat') @@ -48,3 +48,6 @@ index 57e2d0f..d9df4ce 100644 +# TODO: See can we get pkg_resources to do the right thing directly +import paste +paste.__path__.insert(0, paste.__path__.pop(-1)) +-- +1.7.9.5 + diff --git a/rpm/SOURCES/0004-Fix-adding-heat_stack_user-role-via-v3-API.patch b/rpm/SOURCES/0004-Fix-adding-heat_stack_user-role-via-v3-API.patch deleted file mode 100644 index 303a35b7..00000000 --- a/rpm/SOURCES/0004-Fix-adding-heat_stack_user-role-via-v3-API.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 4fc965c4dfe0d59c6bf1f14e87e3350e9e2d7328 Mon Sep 17 00:00:00 2001 -From: Steven Hardy -Date: Tue, 21 Jan 2014 14:51:16 +0000 -Subject: [PATCH] Fix adding heat_stack_user role via v3 API - -A regression was introduced via 301a894 because it expects -keystoneclient functionality which is not yet merged/released, -so instead of passing the name to roles.list() we must filter -the results locally to lookup the role ID. - -The lack of filtering support is a general issue with the v3 -keystoneclient interfaces, so when it's fixed we can remove -this workaround. - -Closes-Bug: #1271190 -Change-Id: I1b29cc131496e4b19493a8cd8e6d4ed913db0938 ---- - heat/common/heat_keystoneclient.py | 10 +++++++--- - heat/tests/test_heatclient.py | 13 ++++++++++++- - 2 files changed, 19 insertions(+), 4 deletions(-) - -diff --git a/heat/common/heat_keystoneclient.py b/heat/common/heat_keystoneclient.py -index 93f7c0c..2b7a29b 100644 ---- a/heat/common/heat_keystoneclient.py -+++ b/heat/common/heat_keystoneclient.py -@@ -253,10 +253,14 @@ class KeystoneClient(object): - # This role is designed to allow easier differentiation of the - # heat-generated "stack users" which will generally have credentials - # deployed on an instance (hence are implicitly untrusted) -- stack_user_role = self.client_v3.roles.list( -- name=cfg.CONF.heat_stack_user_role) -+ # FIXME(shardy): The v3 keystoneclient doesn't currently support -+ # filtering the results, so we have to do it locally, update when -+ # that is fixed in keystoneclient -+ roles_list = self.client_v3.roles.list() -+ stack_user_role = [r for r in roles_list -+ if r.name == cfg.CONF.heat_stack_user_role] - if len(stack_user_role) == 1: -- role_id = stack_user_role[0] -+ role_id = stack_user_role[0].id - logger.debug(_("Adding user %(user)s to role %(role)s") % { - 'user': user.id, 'role': role_id}) - self.client_v3.roles.grant(role=role_id, user=user.id, -diff --git a/heat/tests/test_heatclient.py b/heat/tests/test_heatclient.py -index 1d0f79e..85a503b 100644 ---- a/heat/tests/test_heatclient.py -+++ b/heat/tests/test_heatclient.py -@@ -139,6 +139,7 @@ class KeystoneClientTest(HeatTestCase): - # mock keystone client user functions - self.mock_ks_v3_client.users = self.m.CreateMockAnything() - mock_user = self.m.CreateMockAnything() -+ mock_user.id = 'auser123' - # when keystone is called, the name should have been truncated - # to the last 64 characters of the long name - self.mock_ks_v3_client.users.create(name=good_user_name, -@@ -147,8 +148,18 @@ class KeystoneClientTest(HeatTestCase): - ).AndReturn(mock_user) - # mock out the call to roles; will send an error log message but does - # not raise an exception -+ mock_roles_list = [] -+ for r_id, r_name in (('1234', 'blah'), ('4546', 'heat_stack_user')): -+ mock_role = self.m.CreateMockAnything() -+ mock_role.id = r_id -+ mock_role.name = r_name -+ mock_roles_list.append(mock_role) -+ - self.mock_ks_v3_client.roles = self.m.CreateMockAnything() -- self.mock_ks_v3_client.roles.list(name='heat_stack_user').AndReturn([]) -+ self.mock_ks_v3_client.roles.list().AndReturn(mock_roles_list) -+ self.mock_ks_v3_client.roles.grant(project=ctx.tenant_id, -+ role='4546', -+ user='auser123').AndReturn(None) - self.m.ReplayAll() - # call create_stack_user with a long user name. - # the cleanup VerifyAll should verify that though we passed diff --git a/rpm/SOURCES/0004-Revert-Use-oslo.sphinx.patch b/rpm/SOURCES/0004-Revert-Use-oslo.sphinx.patch new file mode 100644 index 00000000..75f5e483 --- /dev/null +++ b/rpm/SOURCES/0004-Revert-Use-oslo.sphinx.patch @@ -0,0 +1,25 @@ +From ea29122acb62e3c8a9ff9f5f92ed3d0e8899bce7 Mon Sep 17 00:00:00 2001 +From: Dmitry Burmistrov +Date: Thu, 3 Apr 2014 22:21:25 +0400 +Subject: [PATCH] Revert Use oslo.sphinx + +--- + doc/source/conf.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/source/conf.py b/doc/source/conf.py +index 7b436c8..d659327 100644 +--- a/doc/source/conf.py ++++ b/doc/source/conf.py +@@ -205,7 +205,7 @@ extensions = ['sphinx.ext.autodoc', + 'sphinx.ext.pngmath', + 'sphinx.ext.viewcode', + 'sphinx.ext.doctest', +- 'oslosphinx', ++ 'oslo.sphinx', + 'ext.resources'] + + todo_include_todos = True +-- +1.7.9.5 + diff --git a/rpm/SPECS/openstack-heat.spec b/rpm/SPECS/openstack-heat.spec index 33b45ee9..f008f314 100644 --- a/rpm/SPECS/openstack-heat.spec +++ b/rpm/SPECS/openstack-heat.spec @@ -5,6 +5,7 @@ #%global full_release heat-%{version} %global with_doc %{!?_without_doc:1}%{?_without_doc:0} +%global with_doc 0 Name: openstack-heat Summary: OpenStack Orchestration (heat) @@ -30,7 +31,7 @@ Source20: heat-dist.conf Patch0001: 0001-Switch-to-using-M2Crypto.patch Patch0002: 0002-remove-pbr-runtime-dependency.patch Patch0003: 0003-Adjust-to-handle-parallel-installed-packages.patch -Patch0004: 0004-Fix-adding-heat_stack_user-role-via-v3-API.patch +Patch0004: 0004-Revert-Use-oslo.sphinx.patch BuildArch: noarch BuildRequires: git