[openstack-nova/el6-grizzly] Grizzly milestone 1
Nikola Dipanov
ndipanov at fedoraproject.org
Thu Dec 6 18:45:53 UTC 2012
commit 08f422be52cc3ea0da7ee51cb3517162f264ea65
Author: Nikola Dipanov <ndipanov at redhat.com>
Date: Wed Nov 28 12:08:33 2012 +0100
Grizzly milestone 1
.gitignore | 2 +-
...e-don-t-access-the-net-when-building-docs.patch | 4 +-
0002-Fix-rpc-control_exchange-regression.patch | 34 ------
...va-volume.init => openstack-nova-conductor.init | 18 +--
openstack-nova-conductor.upstart | 8 ++
openstack-nova-newdeps.patch | 26 +++--
openstack-nova-volume.upstart | 8 --
openstack-nova.spec | 118 ++++++++++----------
sources | 2 +-
9 files changed, 89 insertions(+), 131 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 591b715..34cdd51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,4 @@
/nova-2012.1.1.tar.gz
/nova-2012.1.3.tar.gz
/nova-2012.2.tar.gz
-/nova-2012.2.1.tar.gz
+/nova-2013.1~g1.tar.gz
diff --git a/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch b/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
index d0774ba..7f3c139 100644
--- a/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
+++ b/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
@@ -1,4 +1,4 @@
-From 6df77db42621ceeae2e9f164416f959b49c89f63 Mon Sep 17 00:00:00 2001
+From 12aa42ff2481bc3fd3ed56c0284f72f20c8d3761 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
Date: Fri, 6 Jan 2012 12:16:34 +0000
Subject: [PATCH] Ensure we don't access the net when building docs
@@ -11,7 +11,7 @@ Change-Id: I9d02fb4053a8106672aded1614a2850e21603eb2
1 file changed, 1 deletion(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 7f77cc5..62b273e 100644
+index 804080e..189d850 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -28,7 +28,6 @@ sys.path.insert(0, os.path.abspath('./'))
diff --git a/openstack-nova-volume.init b/openstack-nova-conductor.init
similarity index 73%
rename from openstack-nova-volume.init
rename to openstack-nova-conductor.init
index f61f685..82b38f1 100644
--- a/openstack-nova-volume.init
+++ b/openstack-nova-conductor.init
@@ -1,30 +1,22 @@
#!/bin/sh
#
-# openstack-nova-volume OpenStack Nova Volume Worker
+# openstack-nova-conductor OpenStack Nova Compute DB Access service
#
# chkconfig: - 98 02
-# description: Volume Workers interact with iSCSI storage to manage \
-# LVM-based instance volumes. Specific functions include: \
-# * Create Volumes \
-# * Delete Volumes \
-# * Establish Compute volumes
+# description: Implementation of an S3-like storage server based on local files.
### BEGIN INIT INFO
# Provides:
# Required-Start: $remote_fs $network $syslog
# Required-Stop: $remote_fs $syslog
# Default-Stop: 0 1 6
-# Short-Description: OpenStack Nova Volume Worker
-# Description: Volume Workers interact with iSCSI storage to manage
-# LVM-based instance volumes. Specific functions include:
-# * Create Volumes
-# * Delete Volumes
-# * Establish Compute volumes
+# Short-Description: OpenStack Nova Compute DB Access service
+# Description: Service to handle database access for compute nodes
### END INIT INFO
. /etc/rc.d/init.d/functions
-suffix=volume
+suffix=conductor
prog=openstack-nova-$suffix
exec="/usr/bin/nova-$suffix"
config="/etc/nova/nova.conf"
diff --git a/openstack-nova-conductor.upstart b/openstack-nova-conductor.upstart
new file mode 100644
index 0000000..34d704d
--- /dev/null
+++ b/openstack-nova-conductor.upstart
@@ -0,0 +1,8 @@
+description "OpenStack Nova Conductor Server"
+
+start on stopped rc RUNLEVEL=[2345]
+stop on runlevel [S016]
+
+respawn
+
+exec su -s /bin/sh -c "exec /usr/bin/nova-conductor --config-file /etc/nova/nova.conf --logfile /var/log/nova/conductor.log" nova
diff --git a/openstack-nova-newdeps.patch b/openstack-nova-newdeps.patch
index 0293a7d..916cd60 100644
--- a/openstack-nova-newdeps.patch
+++ b/openstack-nova-newdeps.patch
@@ -1,10 +1,11 @@
-diff -Naur -Naru nova-2012.2.orig/nova/__init__.py nova-2012.2/nova/__init__.py
---- nova-2012.2.orig/nova/__init__.py 2012-09-26 00:48:35.000000000 +0000
-+++ nova-2012.2/nova/__init__.py 2012-10-11 15:36:40.149461373 +0000
-@@ -31,6 +31,37 @@
- .. moduleauthor:: Andy Smith <andy at anarkystic.com>
+diff --git a/nova/__init__.py b/nova/__init__.py
+index a9eca48..9bf9c4d 100644
+--- a/nova/__init__.py
++++ b/nova/__init__.py
+@@ -24,6 +24,36 @@
+ :platform: Unix
+ :synopsis: Infrastructure-as-a-Service Cloud platform.
"""
-
+import sys
+import pkg_resources
+
@@ -35,14 +36,14 @@ diff -Naur -Naru nova-2012.2.orig/nova/__init__.py nova-2012.2/nova/__init__.py
+import paste
+paste.__path__.insert(0, paste.__path__.pop(-1))
+
-+
- import gettext
+ import gettext
-diff -Naur nova-2012.2.orig/nova/db/sqlalchemy/migration.py nova-2012.2/nova/db/sqlalchemy/migration.py
---- nova-2012.2.orig/nova/db/sqlalchemy/migration.py 2012-10-30 17:51:47.073636210 +0000
-+++ nova-2012.2/nova/db/sqlalchemy/migration.py 2012-10-30 17:56:03.974051764 +0000
-@@ -57,7 +57,12 @@
+diff --git a/nova/db/sqlalchemy/migration.py b/nova/db/sqlalchemy/migration.py
+index dbc1ed4..0260be0 100644
+--- a/nova/db/sqlalchemy/migration.py
++++ b/nova/db/sqlalchemy/migration.py
+@@ -56,7 +56,13 @@ if (not hasattr(migrate, '__version__') or
# NOTE(jkoelker) Delay importing migrate until we are patched
@@ -53,6 +54,7 @@ diff -Naur nova-2012.2.orig/nova/db/sqlalchemy/migration.py nova-2012.2/nova/db/
+except ImportError:
+ # Use the newer path (migrate >= 0.7)
+ from migrate import exceptions as versioning_exceptions
++
from migrate.versioning import api as versioning_api
from migrate.versioning.repository import Repository
diff --git a/openstack-nova.spec b/openstack-nova.spec
index 78d0ff0..d86e1e5 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -1,14 +1,14 @@
%global with_doc %{!?_without_doc:1}%{?_without_doc:0}
Name: openstack-nova
-Version: 2012.2.1
-Release: 3%{?dist}
+Version: 2013.1
+Release: 0.3.g1%{?dist}
Summary: OpenStack Compute (nova)
Group: Applications/System
License: ASL 2.0
URL: http://openstack.org/projects/compute/
-Source0: http://launchpad.net/nova/folsom/%{version}/+download/nova-%{version}.tar.gz
+Source0: http://launchpad.net/nova/grizzly/grizzly-1/+download/nova-2013.1~g1.tar.gz
Source1: nova.conf
Source6: nova.logrotate
@@ -25,8 +25,8 @@ Source14: openstack-nova-objectstore.init
Source140: openstack-nova-objectstore.upstart
Source15: openstack-nova-scheduler.init
Source150: openstack-nova-scheduler.upstart
-Source16: openstack-nova-volume.init
-Source160: openstack-nova-volume.upstart
+Source16: openstack-nova-conductor.init
+Source160: openstack-nova-conductor.upstart
Source18: openstack-nova-xvpvncproxy.init
Source180: openstack-nova-xvpvncproxy.upstart
Source19: openstack-nova-console.init
@@ -41,10 +41,9 @@ Source21: nova-polkit.pkla
Source22: nova-ifc-template
#
-# patches_base=2012.2.1
+# patches_base=grizzly-1
#
Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
-Patch0002: 0002-Fix-rpc-control_exchange-regression.patch
# This is EPEL specific and not upstream
Patch100: openstack-nova-newdeps.patch
@@ -64,10 +63,10 @@ BuildRequires: python-webob1.0
Requires: openstack-nova-compute = %{version}-%{release}
Requires: openstack-nova-cert = %{version}-%{release}
Requires: openstack-nova-scheduler = %{version}-%{release}
-Requires: openstack-nova-volume = %{version}-%{release}
Requires: openstack-nova-api = %{version}-%{release}
Requires: openstack-nova-network = %{version}-%{release}
Requires: openstack-nova-objectstore = %{version}-%{release}
+Requires: openstack-nova-conductor = %{version}-%{release}
Requires: openstack-nova-console = %{version}-%{release}
@@ -85,7 +84,6 @@ standard hardware configurations and seven major hypervisors.
Summary: Components common to all OpenStack Nova services
Group: Applications/System
-Requires: openstack-utils
Requires: python-nova = %{version}-%{release}
Requires(post): chkconfig
@@ -123,10 +121,13 @@ Requires: tunctl
Requires: libguestfs-mount >= 1.7.17
# The fuse dependency should be added to libguestfs-mount
Requires: fuse
+Requires: python-libguestfs
Requires: libvirt >= 0.9.6
Requires: libvirt-python
Requires: openssh-clients
Requires: rsync
+Requires: lvm2
+Requires: python-cinderclient
Requires(pre): qemu-kvm
%description compute
@@ -169,27 +170,6 @@ standard hardware configurations and seven major hypervisors.
This package contains the Nova service for controlling networking.
-%package volume
-Summary: OpenStack Nova storage volume control service
-Group: Applications/System
-
-Requires: openstack-nova-common = %{version}-%{release}
-Requires: lvm2
-Requires: scsi-target-utils
-
-%description volume
-OpenStack Compute (codename Nova) is open source software designed to
-provision and manage large networks of virtual machines, creating a
-redundant and scalable cloud computing platform. It gives you the
-software, control panels, and APIs required to orchestrate a cloud,
-including running instances, managing networks, and controlling access
-through users and projects. OpenStack Compute strives to be both
-hardware and hypervisor agnostic, currently supporting a variety of
-standard hardware configurations and seven major hypervisors.
-
-This package contains the Nova service for controlling storage volumes.
-
-
%package scheduler
Summary: OpenStack Nova VM distribution service
Group: Applications/System
@@ -247,6 +227,24 @@ standard hardware configurations and seven major hypervisors.
This package contains the Nova services providing programmatic access.
+%package conductor
+Summary: OpenStack Nova Conductor services
+Group: Applications/System
+
+Requires: openstack-nova-common = %{version}-%{release}
+
+%description conductor
+OpenStack Compute (codename Nova) is open source software designed to
+provision and manage large networks of virtual machines, creating a
+redundant and scalable cloud computing platform. It gives you the
+software, control panels, and APIs required to orchestrate a cloud,
+including running instances, managing networks, and controlling access
+through users and projects. OpenStack Compute strives to be both
+hardware and hypervisor agnostic, currently supporting a variety of
+standard hardware configurations and seven major hypervisors.
+
+This package contains the Nova services providing database access for
+the compute service
%package objectstore
Summary: OpenStack Nova simple object store service
@@ -361,7 +359,6 @@ This package contains documentation files for nova.
%setup -q -n nova-%{version}
%patch0001 -p1
-%patch0002 -p1
# Apply EPEL patch
%patch100 -p1
@@ -441,7 +438,7 @@ install -p -D -m 755 %{SOURCE12} %{buildroot}%{_initrddir}/openstack-nova-comput
install -p -D -m 755 %{SOURCE13} %{buildroot}%{_initrddir}/openstack-nova-network
install -p -D -m 755 %{SOURCE14} %{buildroot}%{_initrddir}/openstack-nova-objectstore
install -p -D -m 755 %{SOURCE15} %{buildroot}%{_initrddir}/openstack-nova-scheduler
-install -p -D -m 755 %{SOURCE16} %{buildroot}%{_initrddir}/openstack-nova-volume
+install -p -D -m 755 %{SOURCE16} %{buildroot}%{_initrddir}/openstack-nova-conductor
install -p -D -m 755 %{SOURCE18} %{buildroot}%{_initrddir}/openstack-nova-xvpvncproxy
install -p -D -m 755 %{SOURCE19} %{buildroot}%{_initrddir}/openstack-nova-console
install -p -D -m 755 %{SOURCE24} %{buildroot}%{_initrddir}/openstack-nova-consoleauth
@@ -499,18 +496,14 @@ exit 0
%pre compute
usermod -a -G qemu nova
-# Add nova to the fuse group (if present) to support guestmount
-if getent group fuse >/dev/null; then
- usermod -a -G fuse nova
-fi
exit 0
%post compute
/sbin/chkconfig --add openstack-nova-compute
%post network
/sbin/chkconfig --add openstack-nova-network
-%post volume
-/sbin/chkconfig --add openstack-nova-volume
+%post conductor
+/sbin/chkconfig --add openstack-nova-conductor
%post scheduler
/sbin/chkconfig --add openstack-nova-scheduler
%post cert
@@ -540,13 +533,6 @@ if [ $1 -eq 0 ] ; then
/sbin/chkconfig --del openstack-nova-${svc}
done
fi
-%preun volume
-if [ $1 -eq 0 ] ; then
- for svc in volume; do
- /sbin/service openstack-nova-${svc} stop >/dev/null 2>&1
- /sbin/chkconfig --del openstack-nova-${svc}
- done
-fi
%preun scheduler
if [ $1 -eq 0 ] ; then
for svc in scheduler; do
@@ -575,6 +561,13 @@ if [ $1 -eq 0 ] ; then
/sbin/chkconfig --del openstack-nova-${svc}
done
fi
+%preun conductor
+if [ $1 -eq 0 ] ; then
+ for svc in conductor; do
+ /sbin/service openstack-nova-${svc} stop >/dev/null 2>&1
+ /sbin/chkconfig --del openstack-nova-${svc}
+ done
+fi
%preun console
if [ $1 -eq 0 ] ; then
for svc in console consoleauth xvpvncproxy; do
@@ -597,13 +590,6 @@ if [ $1 -ge 1 ] ; then
/sbin/service openstack-nova-${svc} condrestart > /dev/null 2>&1 || :
done
fi
-%postun volume
-if [ $1 -ge 1 ] ; then
- # Package upgrade, not uninstall
- for svc in volume; do
- /sbin/service openstack-nova-${svc} condrestart > /dev/null 2>&1 || :
- done
-fi
%postun scheduler
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
@@ -632,6 +618,13 @@ if [ $1 -ge 1 ] ; then
/sbin/service openstack-nova-${svc} condrestart > /dev/null 2>&1 || :
done
fi
+%postun conductor
+if [ $1 -ge 1 ] ; then
+ # Package upgrade, not uninstall
+ for svc in conductor; do
+ /sbin/service openstack-nova-${svc} condrestart > /dev/null 2>&1 || :
+ done
+fi
%postun console
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
@@ -690,14 +683,6 @@ fi
%{_datarootdir}/nova/openstack-nova-network.upstart
%{_datarootdir}/nova/rootwrap/network.filters
-%files volume
-%{_bindir}/nova-volume
-%{_initrddir}/openstack-nova-volume
-%{_bindir}/nova-volume-usage-audit
-%{_datarootdir}/nova/openstack-nova-volume.upstart
-%{_datarootdir}/nova/rootwrap/volume.filters
-%dir %attr(0755, nova, root) %{_sysconfdir}/nova/volumes
-
%files scheduler
%{_bindir}/nova-scheduler
%{_initrddir}/openstack-nova-scheduler
@@ -730,6 +715,11 @@ fi
%{_datarootdir}/nova/openstack-nova-*api.upstart
%{_datarootdir}/nova/rootwrap/api-metadata.filters
+%files conductor
+%{_bindir}/nova-conductor
+%{_initrddir}/openstack-nova-conductor
+%{_datarootdir}/nova/openstack-nova-conductor.upstart
+
%files objectstore
%{_bindir}/nova-objectstore
%{_initrddir}/openstack-nova-objectstore
@@ -755,6 +745,14 @@ fi
%endif
%changelog
+* Thu Dec 06 2012 Nikola Đipanov <ndipanov at redhat.com> 2013.1-0.3.g1
+- Update to Grizzly milestone 1
+- Remove volume subpackage - removed from Grizzly
+- Add the conductor subpackage - new service added in Grizzly
+- Depend on python-libguestfs instead of libguestfs-mount
+- Don't add the nova user to the group fuse
+- Removes openstack-utils from requirements for nova-common
+
* Thu Dec 06 2012 Nikola Đipanov <ndipanov at redhat.com> - 2012.2.1-3
- signing_dir renamed from incorrect signing_dirname in default nova.conf
diff --git a/sources b/sources
index 5ebe885..a91f24b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-02a96d9bda05e03e8ac9bcef27e27f20 nova-2012.2.1.tar.gz
+8ddcefa21a9b9a0806d922db97208ab6 nova-2013.1~g1.tar.gz
More information about the scm-commits
mailing list