apevec pushed to openstack-heat (master). "Merge --squash rpm-master (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 29 00:52:33 UTC 2015
>From b4f6dc65ec5bf62aa369e7f5af1666a2ea8a7e7b Mon Sep 17 00:00:00 2001
From: Alan Pevec <alan.pevec at redhat.com>
Date: Wed, 29 Apr 2015 02:38:00 +0200
Subject: Merge --squash rpm-master
Conflicts:
.gitignore
0001-remove-pbr-runtime-dependency.patch
0002-Add-compatability-patch-to-allow-smooth-migration-aw.patch
openstack-heat.spec
sources
Change-Id: I40f6e55859cb8f83520d42a970cb2cd6e4067237
diff --git a/.gitignore b/.gitignore
index ccd37c2..49c72e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,26 +1 @@
-/heat-2013.1.rc1.tar.gz
-/heat-2013.1.rc2.tar.gz
-/heat-2013.1.tar.gz
-/heat-2013.2.b1.tar.gz
-/heat-2013.2.b2.tar.gz
-/heat-2013.2.b3.tar.gz
-/heat-2013.2.rc1.tar.gz
-/heat-2013.2.rc2.tar.gz
-/heat-2013.2.tar.gz
-/heat-2014.1.b1.tar.gz
-/heat-2014.1.b2.tar.gz
-/heat-2014.1.b3.tar.gz
-/heat-2014.1.rc1.tar.gz
-/heat-2014.1.rc2.tar.gz
-/heat-2014.1.tar.gz
-/heat-2014.1.1.tar.gz
-/heat-2014.2.b1.tar.gz
-/heat-2014.2.b2.tar.gz
-/heat-2014.2.b3.tar.gz
-/heat-2014.2.rc1.tar.gz
-/heat-2014.2.rc2.tar.gz
-/heat-2014.2.rc3.tar.gz
-/heat-2014.2.tar.gz
-/heat-2014.2.1.tar.gz
-/heat-2014.2.2.tar.gz
-/heat-2014.2.3.tar.gz
+/heat-2015.1.0rc2.tar.gz
diff --git a/0001-remove-pbr-runtime-dependency.patch b/0001-remove-pbr-runtime-dependency.patch
deleted file mode 100644
index 4b370f7..0000000
--- a/0001-remove-pbr-runtime-dependency.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 128cdea7f0be7900bcf8e612ff7452c89652eafa Mon Sep 17 00:00:00 2001
-From: Jeff Peeler <jpeeler at redhat.com>
-Date: Mon, 14 Oct 2013 14:30:34 -0400
-Subject: [PATCH] remove pbr runtime dependency
-
----
- heat/version.py | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/heat/version.py b/heat/version.py
-index a8cd2d7..5383da8 100644
---- a/heat/version.py
-+++ b/heat/version.py
-@@ -12,6 +12,14 @@
- # under the License.
-
-
--import pbr.version
-+class VersionInfo(object):
-+ release = 'REDHATHEATRELEASE'
-+ version = 'REDHATHEATVERSION'
-
--version_info = pbr.version.VersionInfo('heat')
-+ def version_string(self):
-+ return self.version
-+
-+ def release_string(self):
-+ return self.release
-+
-+version_info = VersionInfo()
diff --git a/0002-Add-compatability-patch-to-allow-smooth-migration-aw.patch b/0002-Add-compatability-patch-to-allow-smooth-migration-aw.patch
deleted file mode 100644
index d1981df..0000000
--- a/0002-Add-compatability-patch-to-allow-smooth-migration-aw.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 77882c3c36c29d60e074d1f9bdafac8123df6c6f Mon Sep 17 00:00:00 2001
-From: Jeff Peeler <jpeeler at redhat.com>
-Date: Sat, 21 Jun 2014 00:28:04 -0400
-Subject: [PATCH] Add compatability patch to allow smooth migration away from
- M2Crypto
-
-For many releases, Fedora has shipped with the encryption routines
-reimplemented using M2Crypto. We are now aligning with upstream which
-uses PyCrypto. However, we must still allow decryption of existing
-entries in the database, so this patch will remain until at least
-the next release.
----
- heat/common/crypt.py | 46 +++++++++++++++++++++++++++++++++-------------
- 1 file changed, 33 insertions(+), 13 deletions(-)
-
-diff --git a/heat/common/crypt.py b/heat/common/crypt.py
-index 0defb10..d18d34b 100644
---- a/heat/common/crypt.py
-+++ b/heat/common/crypt.py
-@@ -45,19 +45,39 @@ def oslo_decrypt_v1(auth_info):
- auth_info, b64decode=True)
-
-
-+#This is here for testing verification purposes related to the comment below
-+#def heat_encrypt(auth_info):
-+# import M2Crypto
-+# from os import urandom
-+# iv = urandom(16)
-+# cipher = M2Crypto.EVP.Cipher(alg='aes_128_cbc', key_as_bytes=False,
-+# padding=True,
-+# key=cfg.CONF.auth_encryption_key[:32], iv=iv,
-+# op=1) # 1 is encode
-+# update = cipher.update(auth_info)
-+# final = cipher.final()
-+# res = base64.b64encode(iv + update + final)
-+# return 'heat_decrypt', res
-+
-+
- def heat_decrypt(auth_info):
-- """Decrypt function for data that has been encrypted using an older
-- version of Heat.
-- Note: the encrypt function returns the function that is needed to
-- decrypt the data. The database then stores this. When the data is
-- then retrieved (potentially by a later version of Heat) the decrypt
-- function must still exist. So whilst it may seem that this function
-- is not referenced, it will be referenced from the database.
-- """
-+ # This is an AES specific version of oslo decrypt, reimplementing the
-+ # commented out code below. The main differences are a different key size
-+ # and different padding to be compatible with our old m2crypto based
-+ # heat_encrypt. This patch will be dropped in a few releases since once
-+ # people upgrade, the new encrypt method will be used making this
-+ # decryption method no longer necessary.
-+ #sym = utils.SymmetricCrypto()
-+ #return sym.decrypt(cfg.CONF.auth_encryption_key[:16],
-+ # auth_info, b64decode=True)
-+
- if auth_info is None:
- return None
-- auth = base64.b64decode(auth_info)
-- iv = auth[:AES.block_size]
-- cipher = AES.new(cfg.CONF.auth_encryption_key[:32], AES.MODE_CFB, iv)
-- res = cipher.decrypt(auth[AES.block_size:])
-- return res
-+ auth_info = base64.b64decode(auth_info)
-+ iv = auth_info[:AES.block_size]
-+ # Note: MUST send in 16 bytes long key for AES-128
-+ cipher = AES.new(cfg.CONF.auth_encryption_key[:16], AES.MODE_CBC, iv)
-+ padded = cipher.decrypt(auth_info[AES.block_size:])
-+ l = ord(padded[-1])
-+ plain = padded[:-l]
-+ return plain
diff --git a/openstack-heat.spec b/openstack-heat.spec
index 6ae88d9..60fb5bb 100644
--- a/openstack-heat.spec
+++ b/openstack-heat.spec
@@ -1,19 +1,21 @@
-%global release_name juno
-%global full_release heat-%{version}
-
%global with_doc %{!?_without_doc:1}%{?_without_doc:0}
+%global release_name kilo
+%global milestone .0rc2
+%global service heat
+%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
Name: openstack-heat
Summary: OpenStack Orchestration (heat)
-Version: 2014.2.3
-Release: 4%{?dist}
+Version: 2015.1
+Release: 0.1%{?milestone}%{?dist}
License: ASL 2.0
Group: System Environment/Base
URL: http://www.openstack.org
-Source0: http://tarballs.openstack.org/heat/%{full_release}.tar.gz
+
Obsoletes: heat < 7-9
Provides: heat
+Source0: http://launchpad.net/%{service}/%{release_name}/%{release_name}-rc2/+download/%{service}-%{upstream_version}.tar.gz
Source1: heat.logrotate
%if 0%{?rhel} && 0%{?rhel} <= 6
Source2: openstack-heat-api.init
@@ -28,20 +30,24 @@ Source5: openstack-heat-api-cloudwatch.service
%endif
Source20: heat-dist.conf
-Patch0001: 0001-remove-pbr-runtime-dependency.patch
-Patch0002: 0002-Add-compatability-patch-to-allow-smooth-migration-aw.patch
-
BuildArch: noarch
BuildRequires: git
BuildRequires: python2-devel
BuildRequires: python-stevedore
+BuildRequires: python-oslo-context
+BuildRequires: python-oslo-middleware
+BuildRequires: python-oslo-messaging
BuildRequires: python-setuptools
BuildRequires: python-oslo-db
BuildRequires: python-oslo-i18n
BuildRequires: python-oslo-messaging
BuildRequires: python-oslo-serialization
BuildRequires: python-oslo-sphinx
+BuildRequires: python-oslo-i18n
+BuildRequires: python-oslo-db
BuildRequires: python-oslo-utils
+BuildRequires: python-oslo-log
+BuildRequires: python-oslo-versionedobjects
BuildRequires: python-argparse
BuildRequires: python-eventlet
BuildRequires: python-greenlet
@@ -52,6 +58,7 @@ BuildRequires: python-lxml
BuildRequires: python-netaddr
BuildRequires: python-memcached
BuildRequires: python-migrate
+BuildRequires: python-osprofiler
BuildRequires: python-qpid
BuildRequires: python-six
BuildRequires: PyYAML
@@ -91,16 +98,7 @@ Requires: %{name}-api-cfn = %{version}-%{release}
Requires: %{name}-api-cloudwatch = %{version}-%{release}
%prep
-%setup -q -n %{full_release}
-
-%patch0001 -p1
-%patch0002 -p1
-
-sed -i s/REDHATHEATVERSION/%{version}/ heat/version.py
-sed -i s/REDHATHEATRELEASE/%{release}/ heat/version.py
-
-# make doc build compatible with python-oslo-sphinx RPM
-sed -i 's/oslosphinx/oslo.sphinx/' doc/source/conf.py
+%setup -q -n heat-%{upstream_version}
# Remove the requirements file so that pbr hooks don't add it
# to distutils requires_dist config
@@ -109,6 +107,9 @@ rm -rf {test-,}requirements.txt tools/{pip,test}-requires
# Remove tests in contrib
find contrib -name tests -type d | xargs rm -r
+# Generate sample config
+#tools/config/generate_sample.sh -b . -p heat -o etc/heat
+
# Programmatically update defaults in sample config
# which is installed at /etc/heat/heat.conf
@@ -116,16 +117,16 @@ find contrib -name tests -type d | xargs rm -r
# Since icehouse, there was an uncommented keystone_authtoken section
# at the end of the file which mimics but also conflicted with our
# distro editing that had been done for many releases.
-sed -i '/^[^#[]/{s/^/#/; s/ //g}; /^#[^ ]/s/ = /=/' etc/heat/heat.conf.sample
-sed -i -e "s/^#heat_revision=.*$/heat_revision=%{version}-%{release}/I" etc/heat/heat.conf.sample
+#sed -i '/^[^#[]/{s/^/#/; s/ //g}; /^#[^ ]/s/ = /=/' etc/heat/heat.conf.sample
+#sed -i -e "s/^#heat_revision=.*$/heat_revision=%{version}-%{release}/I" etc/heat/heat.conf.sample
# TODO: Make this more robust
# Note it only edits the first occurance, so assumes a section ordering in sample
# and also doesn't support multi-valued variables.
-while read name eq value; do
- test "$name" && test "$value" || continue
- sed -i "0,/^# *$name=/{s!^# *$name=.*!#$name=$value!}" etc/heat/heat.conf.sample
-done < %{SOURCE20}
+#while read name eq value; do
+# test "$name" && test "$value" || continue
+# sed -i "0,/^# *$name=/{s!^# *$name=.*!#$name=$value!}" etc/heat/heat.conf.sample
+#done < %{SOURCE20}
%build
%{__python} setup.py build
@@ -171,7 +172,7 @@ rm -rf %{buildroot}/var/lib/heat/.dummy
rm -f %{buildroot}/usr/bin/cinder-keystone-setup
rm -rf %{buildroot}/%{python_sitelib}/heat/tests
-install -p -D -m 640 etc/heat/heat.conf.sample %{buildroot}/%{_sysconfdir}/heat/heat.conf
+#install -p -D -m 640 etc/heat/heat.conf.sample %{buildroot}/%{_sysconfdir}/heat/heat.conf
install -p -D -m 640 %{SOURCE20} %{buildroot}%{_datadir}/heat/heat-dist.conf
install -p -D -m 640 etc/heat/api-paste.ini %{buildroot}/%{_datadir}/heat/api-paste-dist.ini
install -p -D -m 640 etc/heat/policy.json %{buildroot}/%{_sysconfdir}/heat
@@ -188,6 +189,7 @@ Heat provides AWS CloudFormation and CloudWatch functionality for OpenStack.
Summary: Heat common
Group: System Environment/Base
+Requires: python-pbr
Requires: python-argparse
Requires: python-eventlet
Requires: python-stevedore >= 0.14
@@ -197,6 +199,7 @@ Requires: python-iso8601
Requires: python-kombu
Requires: python-lxml
Requires: python-netaddr
+Requires: python-osprofiler
Requires: python-paste-deploy
Requires: python-posix_ipc
Requires: python-memcached
@@ -214,11 +217,15 @@ Requires: python-babel
Requires: MySQL-python
Requires: python-oslo-config >= 1:1.2.0
+Requires: python-oslo-context
+Requires: python-oslo-utils
Requires: python-oslo-db
Requires: python-oslo-i18n
+Requires: python-oslo-middleware
Requires: python-oslo-messaging
Requires: python-oslo-serialization
-Requires: python-oslo-utils
+Requires: python-oslo-log
+Requires: python-oslo-versionedobjects
Requires: python-ceilometerclient
Requires: python-cinderclient
@@ -250,7 +257,7 @@ Components common to all OpenStack Heat services
%dir %attr(0755,heat,root) %{_sharedstatedir}/heat
%dir %attr(0755,heat,root) %{_sysconfdir}/heat
%config(noreplace) %{_sysconfdir}/logrotate.d/openstack-heat
-%config(noreplace) %attr(-, root, heat) %{_sysconfdir}/heat/heat.conf
+#%config(noreplace) %attr(-, root, heat) %{_sysconfdir}/heat/heat.conf
%config(noreplace) %attr(-, root, heat) %{_sysconfdir}/heat/policy.json
%config(noreplace) %attr(-,root,heat) %{_sysconfdir}/heat/environment.d/*
%config(noreplace) %attr(-,root,heat) %{_sysconfdir}/heat/templates/*
diff --git a/sources b/sources
index d3540c5..2d4a40c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d63e3f1b68926d53d8eb632b9a6bf2b0 heat-2014.2.3.tar.gz
+5b76294a3253078e7e8f36905fa92ccf heat-2015.1.0rc2.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/openstack-heat.git/commit/?h=master&id=b4f6dc65ec5bf62aa369e7f5af1666a2ea8a7e7b
More information about the scm-commits
mailing list