apevec pushed to openstack-nova (master). "Merge --squash rpm-master (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat Apr 25 22:50:23 UTC 2015
>From 5e6e756e3b4db4c66674d1ea52da628b648e70b1 Mon Sep 17 00:00:00 2001
From: Alan Pevec <alan.pevec at redhat.com>
Date: Sun, 26 Apr 2015 00:43:37 +0200
Subject: Merge --squash rpm-master
Conflicts:
.gitignore
0001-remove-runtime-dep-on-python-pbr.patch
0002-Move-notification-point-to-a-better-place.patch
openstack-nova.spec
sources
Change-Id: I6db7641c0d7f672eab057c5f901c4eae0afe1416
diff --git a/.gitignore b/.gitignore
index 12562a7..530ab45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,37 +1 @@
-/nova-2011.3.1~20120117.10818.tar.gz
-/nova-2011.3.1.tar.gz
-/nova-2012.1~e3.tar.gz
-/nova-2012.1~e4.tar.gz
-/nova-2012.1~rc1.tar.gz
-/nova-2012.1.tar.gz
-/nova-2012.2~f1.tar.gz
-/nova-2012.2~f3.tar.gz
-/nova-2012.2~rc1.tar.gz
-/nova-2012.2.tar.gz
-/nova-2013.1~g1.tar.gz
-/nova-2013.1~g2.tar.gz
-/nova-2013.1.g3.tar.gz
-/nova-2013.1.rc1.tar.gz
-/nova-2013.1.rc2.tar.gz
-/nova-2013.1.tar.gz
-/nova-2013.1.1.tar.gz
-/nova-2013.2.b1.tar.gz
-/nova-2013.2.b2.tar.gz
-/nova-2013.2.b3.tar.gz
-/nova-2013.2.rc1.tar.gz
-/nova-2013.2.rc2.tar.gz
-/nova-2013.2.tar.gz
-/nova-2014.1.b1.tar.gz
-/nova-2014.1.b2.tar.gz
-/nova-2014.1.b3.tar.gz
-/nova-2014.1.rc1.tar.gz
-/nova-2014.1.rc2.tar.gz
-/nova-2014.1.tar.gz
-/nova-2014.1.1.tar.gz
-/nova-2014.2.b2.tar.gz
-/nova-2014.2.b3.tar.gz
-/nova-2014.2.rc1.tar.gz
-/nova-2014.2.rc2.tar.gz
-/nova-2014.2.tar.gz
-/nova-2014.2.1.tar.gz
-/nova-2014.2.2.tar.gz
+/nova-2015.1.0rc2.tar.gz
diff --git a/0001-remove-runtime-dep-on-python-pbr.patch b/0001-remove-runtime-dep-on-python-pbr.patch
deleted file mode 100644
index 0913083..0000000
--- a/0001-remove-runtime-dep-on-python-pbr.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 7719c14dc23376033ecc6d260be717aa03d13227 Mon Sep 17 00:00:00 2001
-From: Nikola Dipanov <ndipanov at redhat.com>
-Date: Fri, 14 Jun 2013 11:29:50 +0200
-Subject: [PATCH] remove runtime dep on python-pbr
-
-Change-Id: I6f247f64c561d49c13e3c2f67401fe150b6d47b6
----
- nova/version.py | 17 ++++++++++++++---
- 1 file changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/nova/version.py b/nova/version.py
-index 7c2a71b..80c0f3d 100644
---- a/nova/version.py
-+++ b/nova/version.py
-@@ -12,8 +12,6 @@
- # License for the specific language governing permissions and limitations
- # under the License.
-
--import pbr.version
--
- from nova.i18n import _
-
- NOVA_VENDOR = "OpenStack Foundation"
-@@ -21,7 +19,20 @@ NOVA_PRODUCT = "OpenStack Nova"
- NOVA_PACKAGE = None # OS distro package version suffix
-
- loaded = False
--version_info = pbr.version.VersionInfo('nova')
-+
-+
-+class VersionInfo(object):
-+ release = "REDHATNOVARELEASE"
-+ version = "REDHATNOVAVERSION"
-+
-+ def version_string(self):
-+ return self.version
-+
-+ def release_string(self):
-+ return self.release
-+
-+
-+version_info = VersionInfo()
- version_string = version_info.version_string
-
-
diff --git a/0002-Move-notification-point-to-a-better-place.patch b/0002-Move-notification-point-to-a-better-place.patch
deleted file mode 100644
index d707238..0000000
--- a/0002-Move-notification-point-to-a-better-place.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 066c8813e389206c82e80de2ff966dab1672217b Mon Sep 17 00:00:00 2001
-From: Alan Pevec <apevec at redhat.com>
-Date: Mon, 14 Apr 2014 18:11:04 +0200
-Subject: [PATCH] Move notification point to a better place
-
-Follow-up for I80f325c9be9c171c2dc8d5526570bf64f0f87c78
-"notify calling process we are ready to serve"
-
-Xavier Queralt found issue with sending readiness notification from inside
-run_service: it returns premature OK in case of multiple service endpoints
-in one systemd service like nova-api which by default provides osapi, ec2 and
-metadata services.
-
-Instead, send readiness notification before entering wait loop for each
-Launcher type.
-
-Change-Id: I69bf10f353f5fecaaf89e537c2d3c46b73e39d36
-Implements: blueprint service-readiness
----
- nova/openstack/common/service.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/nova/openstack/common/service.py b/nova/openstack/common/service.py
-index 80e345b..7c2dc1e 100644
---- a/nova/openstack/common/service.py
-+++ b/nova/openstack/common/service.py
-@@ -190,6 +190,7 @@ class ServiceLauncher(Launcher):
- return status, signo
-
- def wait(self, ready_callback=None):
-+ systemd.notify_once()
- while True:
- self.handle_signal()
- status, signo = self._wait_for_exit_or_signal(ready_callback)
-@@ -382,6 +383,7 @@ class ProcessLauncher(object):
- def wait(self):
- """Loop waiting on children to die and respawning as necessary."""
-
-+ systemd.notify_once()
- LOG.debug('Full set of CONF:')
- CONF.log_opt_values(LOG, std_logging.DEBUG)
-
-@@ -488,7 +490,6 @@ class Services(object):
-
- """
- service.start()
-- systemd.notify_once()
- done.wait()
-
-
diff --git a/openstack-nova.spec b/openstack-nova.spec
index b5a017c..2741e78 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -2,20 +2,22 @@
%global with_trans %{!?_without_trans:1}%{?_without_trans:0}
%global release_name juno
-%global milestone rc2
+%global release_name kilo
+%global milestone .0rc2
+%global service nova
+
+%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
Name: openstack-nova
-Version: 2014.2.2
-Release: 2%{?dist}
+Version: 2015.1
+Release: 0.1%{?milestone}%{?dist}
Summary: OpenStack Compute (nova)
Group: Applications/System
License: ASL 2.0
URL: http://openstack.org/projects/compute/
-Source0: http://launchpad.net/nova/%{release_name}/%{version}/+download/nova-%{version}.tar.gz
+Source0: http://launchpad.net/%{service}/%{release_name}/%{release_name}-rc2/+download/%{service}-%{upstream_version}.tar.gz
-Patch0001: 0001-remove-runtime-dep-on-python-pbr.patch
-Patch0002: 0002-Move-notification-point-to-a-better-place.patch
Source1: nova-dist.conf
Source2: nova.conf.sample
@@ -81,13 +83,6 @@ Summary: Components common to all OpenStack Nova services
Group: Applications/System
Requires: python-nova = %{version}-%{release}
-Requires: python-keystonemiddleware
-Requires: python-oslo-rootwrap
-Requires: python-oslo-messaging >= 1.3.0-0.1.a4
-Requires: python-oslo-i18n
-Requires: python-posix_ipc
-Requires: python-rfc3986
-
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
@@ -122,7 +117,6 @@ Requires: libvirt-python
Requires: libvirt-daemon-kvm
%if 0%{?rhel}==0
Requires: libvirt-daemon-lxc
-Requires: libvirt-daemon-uml
%endif
Requires: openssh-clients
Requires: rsync
@@ -409,6 +403,21 @@ Requires: python-pyasn1
Requires: python-six >= 1.4.1
Requires: python-babel
Requires: python-jinja2
+Requires: python-oslo-concurrency
+Requires: python-keystonemiddleware
+Requires: python-oslo-rootwrap
+Requires: python-oslo-messaging >= 1.3.0-0.1.a4
+Requires: python-oslo-i18n
+Requires: python-posix_ipc
+Requires: python-rfc3986
+Requires: python-oslo-middleware
+Requires: python-oslo-utils
+Requires: python-oslo-serialization
+Requires: python-pbr
+Requires: python-oslo-log
+Requires: python-oslo-context
+Requires: python-jsonschema
+Requires: python-psutil
%description -n python-nova
OpenStack Compute (codename Nova) is open source software designed to
@@ -442,22 +451,12 @@ This package contains documentation files for nova.
%endif
%prep
-%setup -q -n nova-%{version}
-
-%patch0001 -p1
-%patch0002 -p1
+%setup -q -n nova-%{upstream_version}
find . \( -name .gitignore -o -name .placeholder \) -delete
find nova -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} +
-sed -i '/setuptools_git/d' setup.py
-sed -i s/REDHATNOVAVERSION/%{version}/ nova/version.py
-sed -i s/REDHATNOVARELEASE/%{release}/ nova/version.py
-
-# make doc build compatible with python-oslo-sphinx RPM
-sed -i 's/oslosphinx/oslo.sphinx/' doc/source/conf.py
-
# Remove the requirements file so that pbr hooks don't add it
# to distutils requiers_dist config
rm -rf {test-,}requirements.txt tools/{pip,test}-requires
@@ -719,8 +718,6 @@ exit 0
%files compute
%{_bindir}/nova-compute
-%{_bindir}/nova-baremetal-deploy-helper
-%{_bindir}/nova-baremetal-manage
%{_bindir}/nova-idmapshift
%{_unitdir}/openstack-nova-compute.service
%{_datarootdir}/nova/rootwrap/compute.filters
@@ -795,7 +792,7 @@ exit 0
%defattr(-,root,root,-)
%doc LICENSE
%{python_sitelib}/nova
-%{python_sitelib}/nova-%{version}*.egg-info
+%{python_sitelib}/nova-*.egg-info
%if 0%{?with_doc}
%files doc
diff --git a/sources b/sources
index 8af9b75..4c1431c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ca3e254798e19190c302e63c7ea4918b nova-2014.2.2.tar.gz
+b442a319a7d965daeb82fd813e74886c nova-2015.1.0rc2.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/openstack-nova.git/commit/?h=master&id=5e6e756e3b4db4c66674d1ea52da628b648e70b1
More information about the scm-commits
mailing list