Hello community,
here is the log from the commit of package openstack-nova for openSUSE:Factory
checked in at 2013-08-05 20:49:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openstack-nova (Old)
and /work/SRC/openSUSE:Factory/.openstack-nova.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openstack-nova"
Changes:
--------
--- /work/SRC/openSUSE:Factory/openstack-nova/openstack-nova-doc.changes
2013-04-29 14:09:49.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.openstack-nova.new/openstack-nova-doc.changes
2013-08-05 20:49:24.000000000 +0200
@@ -1,0 +2,10 @@
+Fri Jul 19 20:30:51 UTC 2013 - dmuel...@suse.com
+
+- adjust rm command
+
+-------------------------------------------------------------------
+Tue Jul 9 12:02:16 UTC 2013 - dmuel...@suse.com
+
+- update buildrequires
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/openstack-nova/openstack-nova.changes
2013-06-20 21:25:30.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.openstack-nova.new/openstack-nova.changes
2013-08-05 20:49:24.000000000 +0200
@@ -2 +2 @@
-Tue Jun 18 23:55:11 UTC 2013 - opensuse-cl...@opensuse.org
+Sat Aug 3 23:51:39 UTC 2013 - opensuse-cl...@opensuse.org
@@ -4,9 +4,5 @@
-- Update to version 2013.1.3.a17.g3f60606:
- + Fix nova-compute fails to start if quantum is down
- + Don't snat all traffic when force_snat_range set
- + Make nova-api use servicegroup.API.service_is_up().
- + Catch InstanceNotFound in instance_actions GET
- + Fix powervm driver resize instance error
- + Don't update API cell on get_nwinfo
- + set ERROR state when scheduler hits max attempts
- + Volume IO usage gets reset to 0 after a reboot / crash
+- Update to version 2013.2.a2495.g2d86932+git.1375573899.2d86932:
+ + Make delete/soft_delete use objects
+ + Cleanup copy/paste in test_quota_sets
+ + Refactor EC2 API error handling code
+ + Code dedup in class QuotaReserveSqlAlchemyTestCase
@@ -15 +11,580 @@
-Thu Jun 13 00:04:37 UTC 2013 - opensuse-cl...@opensuse.org
+Fri Aug 2 23:43:03 UTC 2013 - opensuse-cl...@opensuse.org
+
+- Update to version 2013.2.a2487.g8dda68a+git.1375486983.8dda68a:
+ + Refactor compute API's delete to properly do local soft_deletes
+ + xenapi: Rename imageupload image
+ + Fix multi availability zone issue part 1
+
+-------------------------------------------------------------------
+Fri Aug 2 17:02:05 UTC 2013 - dmuel...@suse.com
+
+- rediff patches
+
+-------------------------------------------------------------------
+Fri Aug 2 17:01:25 UTC 2013 - opensuse-cl...@opensuse.org
+
+- Update to version 2013.2.a2481.ge685a72+git.1375462885.e685a72:
+ + Remove generic exception catching for admin_actions API v3
+ + Use cached nwinfo for secgroup rules
+ + Add error checking around host service checking
+ + Moves compute.rpcapi.prep_resize call to scheduler.manager
+ + xenapi: Reduce code duplication in vmops
+ + Remove unreachable code
+ + Add support for Neutron https endpoint
+ + Fixes for v3 API servers tests
+ + Adds NoAuthMiddleware for V3
+ + Add index to reservations.uuid column
+ + vendor-data minor format / style cleanups
+ + Port ips-extended to API-v3 ips core API Part 1
+ + Port ips-extended to API-v3 ips core API Part 2
+ + Demote admin-passwd from core of API v3 as extensions os-admin-password
+ + Fix extension hosts follow API v3 rules
+ + Add identity headers while calling glanceclient
+ + Make EvacuateTest DRYer
+
+--------------------------------------------------------------------
+Thu Aug 1 14:04:55 UTC 2013 - speili...@suse.com
+
+- Update to version 2013.2.a2447.g9ce78a9+git.1375365895.9ce78a9:
+ + Fix 2 pep8 errors in tests
+ + Change EC2 client tokens to use system_metadata
+ + Enabled hacking check for Python3 compatible print (H233)
+ + Fix HTTP response for PortNotFound during boot
+ + Use valid IP addresses values in tests
+ + XenAPI: Refactor Fake to create pools, SRs and VIFs automatically
+ + Set VM back to its original state if cold migration failed
+ + Update references with new Mailing List location
+ + Use RetrievePropertiesEx instead of RetrieveProperties
+ + Fix extension rescue follow API v3 rules
+ + Fix flavor v3 follow API v3 rules
+ + Raise exception if both port and fixed-ip are in requested networks.
+ + Fix race between aggregate list and delete
+ + Fix timing issue in SimpleTenantUsageSample test
+ + Logging virtual size of the QCOW2
+ + [xenapi] Unshadow an important test case class
+ + Add expected_errors for extensions services and server_password v3
+ + Add expected_errors for extension evacuate v3
+ + Moves scheduler.rpcapi.prep_resize call on compute.api to conductor
+ + Add expected_errors for extension instance_actions v3
+ + Fix extension server_meta follow API v3 rules
+ + Add expected_errors for extension cells V3
+ + XenAPI: Change the default SR to be the pool default
+ + Disable per-user rate limiting by default
+ + Make ServerXMLSerializationTest DRYer
+ + Merged flavorextradata extension (ephemeral disk size) into core API
+ + Fix extensions agent follow API v3 rules
+ + Add expected_errors for extension_info V3
+ + Config drive attached as cdrom
+ + Implements host uptime API call for cell setup.
+ + Fix flavor_access extension follow API V3 rules
+ + Fix v3 hypervisor extension servers action follow REST principles
+ + Correct status code and response for quota_sets API v3
+ + Add expected_errors for extension server_diagnostics V3
+ + Add expected_errors for extension shelve v3
+ + add vendor_data to the md service and config drive
+ + Speed up test BareMetalPduTestCase.test_exec_pdutool
+ + Remove sleep from service group db and mc tests
+ + return 429 on API rate limiting occur
+ + Code dedup in class InstanceTypeExtraSpecsTestCase
+ + Revert "Add requests requirement capped <1.2.1."
+ + Add notification for live migration call
+ + Remove * import from xenserver plugins
+ + Move tests test_verify_checksum_* to separate class
+ + Code dedup in virt.libvirt.test_imagecache.test_verify_checksum_*
+- Rebase remove-babel-runtime-dep.diff and websockify-05.diff
+
+-------------------------------------------------------------------
+Tue Jul 30 13:21:08 UTC 2013 - bwiedem...@suse.de
+
+- refresh nova-conf-defaults.patch - now with
+ sql_connection=sqlite:///$state_path/baremetal_$sqlite_db
+
+--------------------------------------------------------------------
+Mon Jul 29 23:41:54 UTC 2013 - opensuse-cl...@opensuse.org
+
+- Update to version 2013.2.a2357.gfd7f885+git.1375141314.fd7f885:
+ + Servers API for the new BDM format
+ + Remove the monkey patching of _ into the builtins
+ + xenapi: Fix console rotate script
+ + Add basic BDM format validation in the API layer
+ + Add latest oslo DB support
+ + Don't pass empty image to filter on live migration
+ + Bypass queries which cause a contradiction
+ + Set lock_path in tests
+ + Fix postgresql failures related to Data type to API-v3 fixed-ip
+ + Sync lockutils from Oslo
+ + Fixes Hyper-V issues on versions prior to 2012
+ + Clarify instance_type vs flavor in nova-manage
+ + Use project quota as default user quota
+ + Enabled the hacking warning for Py3 compatible octal literals (H232)
+ + Remove fping plugin from V3 API
+
+--------------------------------------------------------------------
+Sat Jul 27 00:06:02 UTC 2013 - opensuse-cl...@opensuse.org
+
+- Update to version 2013.2.a2327.g1b62c43+git.1374883562.1b62c43:
+ + Add rpcapi tests for shelving calls
+ + Fix policy failure on image_metadata calls
+ + Add expected_errors for extension extended_volumes v3
+ + Per-project-user-quotas for more granularity
+ + port baremetal_nodes API into v3 part1
+ + port BaremetalNodes API into v3 part2
+ + Ensure that uuid is returned with mocked instance
+
+-------------------------------------------------------------------
+Fri Jul 26 12:32:34 UTC 2013 - bwiedem...@suse.com
+
+- refresh websockify-05.diff nova-conf-defaults.patch
+
+--------------------------------------------------------------------
+Thu Jul 25 23:48:59 UTC 2013 - opensuse-cl...@opensuse.org
+
+- Update to version 2013.2.a2313.g73397e7+git.1374796139.73397e7:
+ + Add unique constraint to InstanceTypeExtraSpecs.
+ + Allow exceptions to propagate through stevedore map
+ + Code dedup in test_libvirt_volume
+ + Code dedup in class ImageXMLSerializationTest
+ + Fixes wrong action comment 'lock' to 'unlock'
+ + Create vmware section
+ + Port migrations extension to v3 API part 1
+ + Port migrations extension to v3 API part 2
+ + Sync some of Instance* models with migrations
+ + Change force_dhcp_release default to True
+ + Imported Translations from Transifex
+ + Fixed tests for flavor swap extension after merging in core API
+ + Deduplicate data in TestAddressesXMLSerialization
+ + Fix mig 186 downgrade when using sqlalchemy >= 0.8
+ + Fix up trivial license mismatches
+ + Add validation of available_zone during instance create
+ + Make ServersViewBuilderTest DRYer.
+ + Code dedup in class ServersControllerCreateTest
+ + Add support for volume swap
+ + Sync latest rpc changes from oslo-incubator
+ + Remove hostname param from XenApi after first boot
+ + Fixing dnsdomain_get call in nova.network.manager
+ + Sync models for AgentBuild, Aggregates, AggregateHost tables.
+ + Fix the is_volume_backed_instance check
+ + Start using hacking 0.6
+ + Update oslo.config.generator
+ + xenapi: ensure vcpu_weight configured correctly
+ + Sync eventlet_backdoor from oslo-incubator
+ + Fix iptables rules when metadata_host=127.0.0.1
+ + xenapi: Pass string arguments to popen
+ + Fix leaky network tests
+ + Fix failing network manager unit tests
+
+--------------------------------------------------------------------
+Wed Jul 24 00:02:00 UTC 2013 - opensuse-cl...@opensuse.org
+
+- Update to version 2013.2.a2252.g08dd7f0+git.1374624120.08dd7f0:
+ + Check instance on dest once during block migration
+ + Sync sample config file generator with Oslo
+ + Fix inconsistency between Nova-Net and Neutron
+ + Missed message -> msg_fmt conversion
+ + Add indexes to sqlite
+ + Sync gettextutils from oslo
+ + Cell Scheduler support for hypervisor versions
+ + Remove project_id from alternate image link path
+ + Remove instance_metadata_get_all* from db api
++++ 1834 more lines (skipped)
++++ between /work/SRC/openSUSE:Factory/openstack-nova/openstack-nova.changes
++++ and /work/SRC/openSUSE:Factory/.openstack-nova.new/openstack-nova.changes
Old:
----
0001-Normalize-path-for-finding-api_samples-dir.patch
nova-stable-grizzly.tar.gz
openstack-nova-api.wsgi
sysconfig.openstack-nova-novncproxy
tests-ignore-serial-comparison-failure.diff
New:
----
0001-Alwas-set-model-netfront-for-xen-over-libvirt.patch
nova-master.tar.gz
remove-babel-runtime-dep.diff
websockify-05.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openstack-nova-doc.spec ++++++
--- /var/tmp/diff_new_pack.XrH4hP/_old 2013-08-05 20:49:26.000000000 +0200
+++ /var/tmp/diff_new_pack.XrH4hP/_new 2013-08-05 20:49:26.000000000 +0200
@@ -20,39 +20,35 @@
%define majorversion 2012.2.3
Name: openstack-%{component}-doc
-Version: 2013.1.3.a17.g3f60606
+Version: 2013.2.a2495.g2d86932+git.1375573899.2d86932
Release: 0
Summary: OpenStack Compute (Nova) - Documentation
License: Apache-2.0
Group: Documentation/HTML
Url: http://openstack.org/projects/compute/
-Source: nova-stable-grizzly.tar.gz
+Source: nova-master.tar.gz
BuildRequires: graphviz
BuildRequires: openstack-suse-macros
BuildRequires: python-Cheetah
BuildRequires: python-PasteDeploy
BuildRequires: python-Sphinx
-#BuildRequires: python-SQLAlchemy
BuildRequires: python-WebOb
BuildRequires: python-base
BuildRequires: python-boto
-#BuildRequires: python-cinderclient
+BuildRequires: python-d2to1
BuildRequires: python-distribute
BuildRequires: python-eventlet
BuildRequires: python-feedparser
-#BuildRequires: python-glanceclient
BuildRequires: python-iso8601
BuildRequires: python-ldap
BuildRequires: python-lxml
BuildRequires: python-mox
BuildRequires: python-netaddr
-#BuildRequires: python-nova
+BuildRequires: python-oslo.sphinx
BuildRequires: python-paste
+BuildRequires: python-pbr
BuildRequires: python-pyOpenSSL
-#BuildRequires: python-qpid
-#BuildRequires: python-quantumclient
BuildRequires: python-routes
-#BuildRequires: python-zmq
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -65,12 +61,12 @@
This package contains documentation files for openstack-nova.
%prep
-%setup -q -n nova-2013.1.3.a17.g3f60606
+%setup -q -n nova-2013.2.a2495.g2d86932
%openstack_cleanup_prep
%build
python setup.py build_sphinx
-rm -rf doc/build/html/.buildinfo # Remove unneeded files
+rm doc/build/html/.buildinfo # Remove unneeded files
%install
++++++ openstack-nova.spec ++++++
--- /var/tmp/diff_new_pack.XrH4hP/_old 2013-08-05 20:49:26.000000000 +0200
+++ /var/tmp/diff_new_pack.XrH4hP/_new 2013-08-05 20:49:26.000000000 +0200
@@ -22,46 +22,47 @@
%define username openstack-%{component}
Name: openstack-%{component}
-Version: 2013.1.3.a17.g3f60606
+Version: 2013.2.a2495.g2d86932+git.1375573899.2d86932
Release: 0
Summary: OpenStack Compute (Nova)
License: Apache-2.0
Group: System/Management
Url: https://launchpad.net/nova
-Source: nova-stable-grizzly.tar.gz
+Source: nova-master.tar.gz
Source1: %{name}.init
Source2: %{name}.logrotate
Source4: openstack-nova-manage.sh
Source6: openstack-nova-vncproxy.init
-# WSGI application skeleton for API app (for the SSL proxy):
-Source7: openstack-nova-api.wsgi
Source8: openstack-nova-network-init-bnc777488.patch
Source9: org.openstack.nova.compute.pkla
Source10: openstack-nova-novncproxy.init
-Source11: sysconfig.openstack-nova-novncproxy
Source12: nova-sudoers
Source13: openstack-nova-polkit.rules
#TODO/FIXME(saschpe,dirk): I think we want to get rid of this again and only
use openstack-utils:
# our SUSE defaults - mostly set stuff to Quantum
Patch1: nova-conf-defaults.patch
+# PATCH-FIX-SLES TODO --
+Patch2: nova-network-filter-bnc777488.patch
# PATCH-FIX-SLES rha...@suse.com --
# This adds support for using /dev/rdb? devices for ceph volumes. It's need
# because our qemu and libvirt don't have librados support yet. (Not sure yet
if
# this is worth upstreaming, we would at least have to make in configurable)
-Patch2: nova-rbd-use-local-devices.patch
-# PATCH-FIX-SLES TODO --
-Patch3: nova-network-filter-bnc777488.patch
-Patch4: 0001-Normalize-path-for-finding-api_samples-dir.patch
-# PATH-FIX-SLES dmuel...@suse.com -- ignore a not very relevant testsuite check
-Patch5: tests-ignore-serial-comparison-failure.diff
-BuildRequires: apache2
+Patch3: nova-rbd-use-local-devices.patch
+Patch4: websockify-05.diff
+Patch6: remove-babel-runtime-dep.diff
+# https://bugs.launchpad.net/nova/+bug/1202199
+# https://review.openstack.org/#/c/37477/
+Patch7: 0001-Alwas-set-model-netfront-for-xen-over-libvirt.patch
BuildRequires: fdupes
BuildRequires: openstack-suse-macros
BuildRequires: openstack-suse-sudo
BuildRequires: openstack-utils
BuildRequires: python-base
+BuildRequires: python-d2to1
BuildRequires: python-distribute
BuildRequires: python-oslo.config
+BuildRequires: python-oslo.sphinx
+BuildRequires: python-pbr
# Documentation requirements:
BuildRequires: python-Sphinx
%if 0%{?suse_version} > 1110
@@ -75,11 +76,8 @@
Requires: openstack-suse-sudo
Requires: python >= 2.6.8
Requires: python-nova = %{version}
-Requires: python-oslo.config >= 1.1.0
+Requires: python-oslo.config >= 1.2.0a3
#Requires: vblade-persist
-# To generate a self-signed certificate to be used in demo setups:
-Requires(post): apache2-utils
-Requires(post): openssl
Requires(post): sysconfig
%if 0%{?suse_version} > 1110
Requires(pre): pwdutils
@@ -116,8 +114,9 @@
Requires: python-argparse
Requires: python-boto
Requires: python-cinderclient >= 1.0.1
+Requires: python-d2to1 >= 0.2.10
Requires: python-eventlet >= 0.9.17
-Requires: python-glanceclient >= 0.5.0
+Requires: python-glanceclient >= 0.9.0
Requires: python-greenlet >= 0.3.1
Requires: python-httplib2
Requires: python-iso8601 >= 0.1.4
@@ -125,12 +124,17 @@
Requires: python-kombu >= 1.0.4
Requires: python-lxml >= 2.3
Requires: python-netaddr >= 0.7.6
+Requires: python-neutronclient >= 2.2.3
Requires: python-paramiko
+Requires: python-pbr >= 0.5.16
Requires: python-pyasn1
-Requires: python-quantumclient >= 2.2.0
+Requires: python-requests >= 1.1
+Requires: python-six
+Requires: python-sqlalchemy >= 0.7.8
Requires: python-sqlalchemy-migrate >= 0.7.2
-Requires: python-stevedore >= 0.7
+Requires: python-stevedore >= 0.9
Requires: python-suds >= 0.4
+Requires: python-websockify
%description -n python-nova
This package contains the core Python module of OpenStack Nova.
@@ -138,9 +142,10 @@
%package api
Summary: OpenStack Compute (Nova) - API
Group: System/Management
-Requires: %{name} = %{version}
+# prereq for creating the right openstack-nova user/group
+PreReq: %{name} = %{version}
+Requires: openstack-neutron-server
Requires: openstack-nova-conductor = %{version}
-Requires: openstack-quantum-server
%description api
This package contains the OpenStack Nova API.
@@ -175,7 +180,6 @@
Summary: Openstack Compute (Nova) - Console Access
Group: System/Management
Requires: %{name} = %{version}
-Requires: python-websockify
%description console
This package contains the console access service for OpenStack Nova.
@@ -191,10 +195,13 @@
%package compute
Summary: OpenStack Compute (Nova) - Compute
Group: System/Management
-Requires: %{name} = %{version}
+# prereq for creating the right openstack-nova user/group
+PreReq: %{name} = %{version}
Requires: bridge-utils
Requires: libvirt >= 0.8.1
Requires: libvirt-python >= 0.8.1
+Requires: openssh
+Requires: rsync
Requires: tunctl
%if 0%{?suse_version} < 1220
Requires(post): PolicyKit
@@ -218,8 +225,6 @@
Group: System/Management
Requires: %{name} = %{version}
Requires: novnc
-Requires: python-numpy
-Requires: python-websockify
%description novncproxy
This package contains the novnc-proxy service for OpenStack.
@@ -260,10 +265,12 @@
%endif
Requires: python-feedparser
Requires: python-fixtures >= 0.3.12
+Requires: python-flake8 >= 2.0
+Requires: python-hacking >= 0.5.3
Requires: python-mox >= 0.5.3
-Requires: python-pep8 >= 1.3.3
+Requires: python-pep8 >= 1.4.5
Requires: python-psycopg2
-Requires: python-pyflakes
+Requires: python-pyflakes >= 0.7.2
Requires: python-python-subunit
Requires: python-testrepository >= 0.0.13
Requires: python-testtools >= 0.9.27
@@ -273,14 +280,15 @@
OpenStack Nova and its components.
%prep
-%setup -q -n nova-2013.1.3.a17.g3f60606
+%setup -q -n nova-2013.2.a2495.g2d86932
%patch1
+%patch2 -p1
+%patch4 -p1
+%patch6 -p1
+%patch7 -p1
# nova-volume code has been removed upstream in git commit
7e2b93acc59dea81d52684f7f659fcff32507e14
# TODO
-#patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5
+#patch3 -p1
%openstack_cleanup_prep
%build
@@ -302,8 +310,8 @@
install -d -m 755 %{buildroot}%{_localstatedir}/run/nova
### configuration files
-install -p -D -m 644 etc/nova/nova.conf.sample
%{buildroot}%{_sysconfdir}/nova/nova.conf
-install -p -D -m 644 etc/nova/api-paste.ini etc/nova/policy.json
%{buildroot}%{_sysconfdir}/nova/
+install -p -D -m 600 etc/nova/nova.conf.sample
%{buildroot}%{_sysconfdir}/nova/nova.conf
+install -p -D -m 600 etc/nova/api-paste.ini etc/nova/policy.json
%{buildroot}%{_sysconfdir}/nova/
install -p -D -m 644 etc/nova/rootwrap.conf %{buildroot}%{_sysconfdir}/nova/
cp -a etc/nova/rootwrap.d/ %{buildroot}%{_sysconfdir}/nova/
# bash-completion/logrotate/etc.
@@ -343,23 +351,9 @@
cp -r --preserve=timestamps doc/api_samples
%{buildroot}%{_localstatedir}/lib/%{name}-test/doc/
%fdupes %{buildroot}%{_localstatedir}/lib/%{name}-test
-### apache/WSGI for SSL
-# Apache2 SSL certificate stubs (generated in %%post)
-install -d %{buildroot}%{_sysconfdir}/apache2/ssl.{crt,csr,key}
-install -d %{buildroot}/srv/www/htdocs
-touch %{buildroot}%{_sysconfdir}/apache2/ssl.key/openstack-nova-{ca,server}.key
-touch %{buildroot}%{_sysconfdir}/apache2/ssl.csr/openstack-nova-server.csr
-touch %{buildroot}%{_sysconfdir}/apache2/ssl.crt/openstack-nova-{ca,server}.crt
-# Apache2 WSGI apps
-for api in ec2 osapi_compute osapi_volume metadata ; do
- install -D %{SOURCE7} %{buildroot}%{_localstatedir}/lib/nova/wsgi/$api.wsgi
-done
-
### misc
%fdupes %{buildroot}%{python_sitelib}/%{component}
-install -p -D -m 644 %{SOURCE11}
%{buildroot}%{_var}/adm/fillup-templates/sysconfig.opentstack-nova-novncproxy
-
%if 0%{?suse_version} > 1110 && 0%{?suse_version} < 1230
mkdir -p
%{buildroot}%{_localstatedir}/lib/polkit-1/localauthority/10-vendor.d/
cp -a %{SOURCE9}
%{buildroot}%{_localstatedir}/lib/polkit-1/localauthority/10-vendor.d/
@@ -374,12 +368,19 @@
openstack-config --set %{nova_conf} DEFAULT log_file nova.log
openstack-config --set %{nova_conf} DEFAULT log_dir /var/log/nova
openstack-config --set %{nova_conf} DEFAULT connection_type libvirt
+openstack-config --set %{nova_conf} DEFAULT compute_driver
libvirt.LibvirtDriver
openstack-config --set %{nova_conf} DEFAULT image_service
nova.image.glance.GlanceImageService
openstack-config --set %{nova_conf} DEFAULT volume_api_class
nova.volume.cinder.API
openstack-config --set %{nova_conf} DEFAULT auth_strategy keystone
-openstack-config --set %{nova_conf} DEFAULT network_manager
nova.network.manager.FlatDHCPManager
-openstack-config --set %{nova_conf} DEFAULT service_quantum_metadata_proxy True
-openstack-config --set %{nova_conf} DEFAULT security_group_api quantum
+openstack-config --set %{nova_conf} DEFAULT network_api_class
nova.network.neutronv2.api.API
+openstack-config --set %{nova_conf} DEFAULT neutron_admin_username neutron
+openstack-config --set %{nova_conf} DEFAULT neutron_admin_password
'%%SERVICE_PASSWORD%%'
+openstack-config --set %{nova_conf} DEFAULT neutron_admin_tenant_name
'%%SERVICE_TENANT_NAME%%'
+openstack-config --set %{nova_conf} DEFAULT libvirt_vif_driver
nova.virt.libvirt.vif.LibvirtBridgeDriver
+openstack-config --set %{nova_conf} DEFAULT state_path /var/lib/nova
+openstack-config --set %{nova_conf} DEFAULT lock_path
%{_localstatedir}/lock/nova
+openstack-config --set %{nova_conf} DEFAULT service_neutron_metadata_proxy True
+openstack-config --set %{nova_conf} DEFAULT security_group_api neutron
#NOTE(saschpe): Do we want to use sqlite per default or demand PostgreSQL
right away?
openstack-config --set %{nova_conf} sql connection
sqlite:////var/lib/nova/nova.db
@@ -388,18 +389,14 @@
sed -s "s,\(signing_dir =\).*,\1 /var/cache/glance/api,"
%{buildroot}%{_sysconfdir}/nova/api-paste.ini
%pre
-getent group %{groupname} >/dev/null || groupadd -r %{groupname}
+# need a fixed uid/gid for being able to use shared storage over NFS
+getent group %{groupname} >/dev/null || groupadd -g 96 %{groupname}
getent passwd %{username} >/dev/null || \
-useradd -r -g %{groupname} -d %{_localstatedir}/lib/nova -s /sbin/nologin \
--c "OpenStack Nova Daemons" %{username}
+useradd -M -u 96 -s /bin/bash -g %{groupname} -d %{_localstatedir}/lib/nova -c
"OpenStack Nova Daemons" %{username}
exit 0
%post
%{fillup_and_insserv -f openstack-nova-rpc-zmq-receiver}
-if [ ! -s %{_sysconfdir}/apache2/ssl.csr/openstack-nova-server.csr ] ; then
- # Generate a self-signed certificate to be used in non-production setups:
- (umask 377 ; /usr/bin/gensslcert -C openstack-nova -n nova.example.com)
-fi
%preun
%stop_on_removal openstack-nova-rpc-zmq-receiver
@@ -497,7 +494,7 @@
%insserv_cleanup
%post novncproxy
-%{fillup_and_insserv -n openstack-nova-novncproxy -f openstack-nova-novncproxy}
+%{fillup_and_insserv -f openstack-nova-novncproxy}
%preun novncproxy
%stop_on_removal openstack-nova-novncproxy
@@ -533,9 +530,10 @@
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%config %{_sysconfdir}/sudoers.d/openstack-nova
%dir %{_sysconfdir}/nova
+%dir %attr(0755, %{username}, %{username}) %{_localstatedir}/cache/nova
%config(noreplace) %attr(0640, root, %{groupname})
%{_sysconfdir}/nova/api-paste.ini
%config(noreplace) %attr(0640, root, %{groupname})
%{_sysconfdir}/nova/nova.conf
-%config %{_sysconfdir}/nova/policy.json
+%config %attr(0640, root, %{groupname}) %{_sysconfdir}/nova/policy.json
%config %{_sysconfdir}/nova/rootwrap.conf
%dir %{_sysconfdir}/nova/rootwrap.d
%dir %attr(0755, %{username}, root) %{_localstatedir}/lib/nova
@@ -549,19 +547,12 @@
%{_mandir}/man1/nova-all.1%{?ext_man}
%{_mandir}/man1/nova-manage.1%{?ext_man}
%{_mandir}/man1/nova-rootwrap.1%{?ext_man}
-# apache integration for ssl setup
-%ghost %{_sysconfdir}/apache2/ssl.key/openstack-nova-*.key
-%ghost %{_sysconfdir}/apache2/ssl.csr/openstack-nova-server.csr
-%ghost %{_sysconfdir}/apache2/ssl.crt/openstack-nova-*.crt
-%dir %attr(0755, root, root) %{_localstatedir}/lib/nova/wsgi
%dir %attr(0755, root, root) %{_localstatedir}/lib/nova/images
%dir %attr(0755, %{username}, root) %{_localstatedir}/lib/nova/instances
%dir %attr(0755, root, root) %{_localstatedir}/lib/nova/keys
%dir %attr(0755, root, root) %{_localstatedir}/lib/nova/networks
%dir %attr(0755, root, root) %{_localstatedir}/lib/nova/tmp
-%attr(0644, root, root) %{_localstatedir}/lib/nova/wsgi/*.wsgi
-
# FIXME: which package should these go in?
%{_initddir}/%{name}-rpc-zmq-receiver
%{_sbindir}/rc%{name}-rpc-zmq-receiver
@@ -580,7 +571,6 @@
%defattr(-,root,root,-)
%doc LICENSE
%config %{_sysconfdir}/nova/rootwrap.d/api-metadata.filters
-%dir %attr(0755, %{username}, %{username}) %{_localstatedir}/cache/nova
%{_initddir}/%{name}-api
%{_sbindir}/rc%{name}-api
%{_bindir}/nova-api
@@ -670,7 +660,6 @@
%{_sbindir}/rc%{name}-novncproxy
%{_bindir}/nova-novncproxy
%{_mandir}/man1/nova-novncproxy.1%{?ext_man}
-/var/adm/fillup-templates/sysconfig.opentstack-nova-novncproxy
%files objectstore
%defattr(-,root,root,-)
++++++ 0001-Alwas-set-model-netfront-for-xen-over-libvirt.patch ++++++
>From 73a12eabc44ba16f804cbfd9e780abfcbb7db486 Mon Sep 17 00:00:00 2001
From: Tomasz Paszkowski <tpaszkow...@suse.com>
Date: Wed, 17 Jul 2013 15:47:46 +0200
Subject: [PATCH] Alwas set model = 'netfront' for xen over libvirt.
This will prevent emulated network driver to be attached to virtual machine.
Emulated network driver is not working for xen over libvirt as tap interface
name is suffixed by xen with '-emu' which makes this interface name to long.
Additionaly security groups will not also work for this interface as openstack
is setting up filters on interface without -emu suffix.
Change-Id: I0907ce148e473edf6b81ea782fac2fa6a1b71a2d
Fixes: bug #1202199
---
nova/tests/virt/libvirt/test_libvirt_vif.py | 2 +-
nova/virt/libvirt/vif.py | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
Index: nova-2013.2.a2481.ge685a72/nova/virt/libvirt/vif.py
===================================================================
--- nova-2013.2.a2481.ge685a72.orig/nova/virt/libvirt/vif.py
+++ nova-2013.2.a2481.ge685a72/nova/virt/libvirt/vif.py
@@ -114,6 +114,12 @@ class LibvirtBaseVIFDriver(object):
CONF.libvirt_type in ('kvm', 'qemu') and
CONF.libvirt_use_virtio_for_bridges):
model = "virtio"
+ # For xen over libvirt we need to always use PV network
+ # drives as emulated ones will not work (xen suffixes them
+ # -emu which makes interface name to long). Additionaly
+ # security groups will not also work for -emu suffixed interfaces.
+ elif CONF.libvirt_type == "xen":
+ model = "netfront"
# Workaround libvirt bug, where it mistakenly
# enables vhost mode, even for non-KVM guests
++++++ _service ++++++
--- /var/tmp/diff_new_pack.XrH4hP/_old 2013-08-05 20:49:26.000000000 +0200
+++ /var/tmp/diff_new_pack.XrH4hP/_new 2013-08-05 20:49:26.000000000 +0200
@@ -1,7 +1,6 @@
<services>
<service name="git_tarballs" mode="disabled">
- <param
name="url">http://tarballs.openstack.org/nova/nova-stable-grizzly.tar.gz</param>
+ <param
name="url">http://tarballs.openstack.org/nova/nova-master.tar.gz</param>
<param name="email">opensuse-cl...@opensuse.org</param>
- <param name="plain-version">True</param>
</service>
</services>
++++++ nova-conf-defaults.patch ++++++
--- /var/tmp/diff_new_pack.XrH4hP/_old 2013-08-05 20:49:26.000000000 +0200
+++ /var/tmp/diff_new_pack.XrH4hP/_new 2013-08-05 20:49:26.000000000 +0200
@@ -1,49 +1,61 @@
+Index: etc/nova/api-paste.ini
+===================================================================
+--- etc/nova/api-paste.ini.orig
++++ etc/nova/api-paste.ini
+@@ -120,6 +120,6 @@ admin_password = %SERVICE_PASSWORD%
+ # signing_dir is configurable, but the default behavior of the authtoken
+ # middleware should be sufficient. It will create a temporary directory
+ # in the home directory for the user the nova process is running as.
+-#signing_dir = /var/lib/nova/keystone-signing
++signing_dir = /var/lib/nova/keystone-signing
+ # Workaround for https://bugs.launchpad.net/nova/+bug/1154809
+ auth_version = v2.0
Index: etc/nova/nova.conf.sample
===================================================================
--- etc/nova/nova.conf.sample.orig
+++ etc/nova/nova.conf.sample
-@@ -65,7 +65,7 @@
+@@ -56,7 +56,7 @@
#
# ip address of this host (string value)
-#my_ip=10.0.0.1
-+my_ip=<IP>
++my_ip=10.0.0.1
# Name of this node. This can be an opaque identifier. It is
# not necessarily a hostname, FQDN, or IP address. However,
-@@ -108,11 +108,11 @@
+@@ -93,11 +93,11 @@
#pybasedir=/usr/lib/python/site-packages
# Directory where nova binaries are installed (string value)
--#bindir=$pybasedir/bin
-+bindir=/usr/bin
+-#bindir=/usr/local/bin
++bindir=/usr/local/bin
# Top-level directory for maintaining nova's state (string
# value)
-#state_path=$pybasedir
-+state_path=/var/lib/nova
++state_path=$pybasedir
#
-@@ -330,7 +330,7 @@
+@@ -317,7 +317,7 @@
# The strategy to use for auth: noauth or keystone. (string
# value)
-#auth_strategy=noauth
-+auth_strategy=keystone
++auth_strategy=noauth
# Treat X-Forwarded-For as the canonical remote address. Only
# enable this if you have a sanitizing proxy. (boolean value)
-@@ -405,7 +405,7 @@
+@@ -395,7 +395,7 @@
- # Set flag to indicate Quantum will proxy metadata requests
+ # Set flag to indicate Neutron will proxy metadata requests
# and resolve instance ids. (boolean value)
--#service_quantum_metadata_proxy=false
-+service_quantum_metadata_proxy=true
+-#service_neutron_metadata_proxy=false
++service_neutron_metadata_proxy=false
- # Shared secret to validate proxies Quantum metadata requests
+ # Shared secret to validate proxies Neutron metadata requests
# (string value)
-@@ -857,7 +857,7 @@
+@@ -930,7 +930,7 @@
# hostname or ip for openstack to use when accessing the s3
# api (string value)
@@ -52,148 +64,131 @@
# port used when accessing the s3 api (integer value)
#s3_port=3333
-@@ -890,7 +890,7 @@
+@@ -972,7 +972,7 @@
# The full class name of the network API class to use (string
# value)
-#network_api_class=nova.network.api.API
-+network_api_class=nova.network.quantumv2.api.API
++network_api_class=nova.network.api.API
#
-@@ -1081,10 +1081,10 @@
+@@ -1167,12 +1167,12 @@
#vpn_start=1000
# Number of addresses in each private subnet (integer value)
-#network_size=256
-+network_size=5000
++network_size=256
- # Fixed IP address block (string value)
+ # DEPRECATED - Fixed IP address block.If set to an empty
+ # string, the subnet range(s) will be automatically determined
+ # and configured. (string value)
-#fixed_range=10.0.0.0/8
-+fixed_range=192.168.0.0/24
++fixed_range=10.0.0.0/8
# Fixed IPv6 address block (string value)
#fixed_range_v6=fd00::/48
-@@ -1148,7 +1148,7 @@
+@@ -1236,7 +1236,7 @@
#
- # URL for connecting to quantum (string value)
--#quantum_url=http://127.0.0.1:9696
-+quantum_url=http://<IP>:9696
+ # URL for connecting to neutron (string value)
+-#neutron_url=http://127.0.0.1:9696
++neutron_url=http://127.0.0.1:9696
- # timeout value for connecting to quantum in seconds (integer
+ # timeout value for connecting to neutron in seconds (integer
# value)
-@@ -1156,15 +1156,15 @@
+@@ -1244,11 +1244,11 @@
- # username for connecting to quantum in admin context (string
+ # username for connecting to neutron in admin context (string
# value)
--#quantum_admin_username=<None>
-+quantum_admin_username=quantum
+-#neutron_admin_username=<None>
++neutron_admin_username=<None>
- # password for connecting to quantum in admin context (string
+ # password for connecting to neutron in admin context (string
# value)
--#quantum_admin_password=<None>
-+quantum_admin_password=%SERVICE_PASSWORD%
-
- # tenant name for connecting to quantum in admin context
- # (string value)
--#quantum_admin_tenant_name=<None>
-+quantum_admin_tenant_name=service
+-#neutron_admin_password=<None>
++neutron_admin_password=<None>
- # region name for connecting to quantum in admin context
+ # tenant name for connecting to neutron in admin context
# (string value)
-@@ -1179,7 +1179,7 @@
+@@ -1267,7 +1267,7 @@
- # auth strategy for connecting to quantum in admin context
+ # auth strategy for connecting to neutron in admin context
# (string value)
--#quantum_auth_strategy=keystone
-+quantum_auth_strategy=keystone
+-#neutron_auth_strategy=keystone
++neutron_auth_strategy=keystone
# Name of Integration Bridge used by Open vSwitch (string
# value)
-@@ -1208,7 +1208,7 @@
+@@ -1300,7 +1300,7 @@
#
# The full class name of the security API class (string value)
-#security_group_api=nova
-+security_group_api=quantum
++security_group_api=nova
- # The full class name of the security group handler class
- # (string value)
-@@ -1292,7 +1292,7 @@
- # The SQLAlchemy connection string used to connect to the
- # database (string value)
--#sql_connection=sqlite:////nova/openstack/common/db/$sqlite_db
-+sql_connection=mysql://root:<mysql-password>@<IP>/nova
-
- # the filename to use with sqlite (string value)
- #sqlite_db=nova.sqlite
-@@ -1350,7 +1350,7 @@
+ #
+@@ -1351,7 +1351,7 @@
+ #disable_process_locking=false
- # Directory to use for lock files. Default to a temp directory
- # (string value)
+ # Directory to use for lock files. (string value)
-#lock_path=<None>
-+lock_path=/var/run/nova
++lock_path=<None>
#
-@@ -1363,7 +1363,7 @@
+@@ -1364,7 +1364,7 @@
# Print more verbose output (set logging level to INFO instead
# of default WARNING level). (boolean value)
-#verbose=false
-+verbose=true
++verbose=false
# Log output to standard error (boolean value)
#use_stderr=true
-@@ -1427,7 +1427,7 @@
+@@ -1426,7 +1426,7 @@
- # (Optional) The directory to keep log files in (will be
- # prepended to --log-file) (string value)
+ # (Optional) The base directory used for relative --log-file
+ # paths (string value)
-#log_dir=<None>
-+log_dir=/var/log/nova
++log_dir=<None>
# Use syslog for logging. (boolean value)
#use_syslog=false
-@@ -1524,7 +1524,7 @@
+@@ -1532,7 +1532,7 @@
# The RabbitMQ broker address where a single node is used
# (string value)
-#rabbit_host=localhost
-+rabbit_host=$my_ip
++rabbit_host=localhost
# The RabbitMQ broker port where a single node is used
# (integer value)
-@@ -1862,7 +1862,7 @@
- # include: libvirt.LibvirtDriver, xenapi.XenAPIDriver,
+@@ -1851,7 +1851,7 @@
# fake.FakeDriver, baremetal.BareMetalDriver,
- # vmwareapi.VMWareESXDriver (string value)
+ # vmwareapi.VMwareESXDriver, vmwareapi.VMwareVCDriver (string
+ # value)
-#compute_driver=<None>
-+compute_driver=libvirt.LibvirtDriver
++compute_driver=<None>
# The default format an ephemeral_volume will be formatted
# with on creation. (string value)
-@@ -2000,7 +2000,7 @@
+@@ -1943,7 +1943,7 @@
#snapshot_image_format=<None>
# The libvirt VIF driver to configure the VIFs. (string value)
-#libvirt_vif_driver=nova.virt.libvirt.vif.LibvirtGenericVIFDriver
-+libvirt_vif_driver=nova.virt.libvirt.vif.LibvirtBridgeDriver
++libvirt_vif_driver=nova.virt.libvirt.vif.LibvirtGenericVIFDriver
# Libvirt handlers for remote volumes. (list value)
#libvirt_volume_drivers=iscsi=nova.virt.libvirt.volume.LibvirtISCSIVolumeDriver,local=nova.virt.libvirt.volume.LibvirtVolumeDriver,fake=nova.virt.libvirt.volume.LibvirtFakeVolumeDriver,rbd=nova.virt.libvirt.volume.LibvirtNetVolumeDriver,sheepdog=nova.virt.libvirt.volume.LibvirtNetVolumeDriver,nfs=nova.virt.libvirt.volume.LibvirtNFSVolumeDriver,aoe=nova.virt.libvirt.volume.LibvirtAOEVolumeDriver,glusterfs=nova.virt.libvirt.volume.LibvirtGlusterfsVolumeDriver,fibre_channel=nova.virt.libvirt.volume.LibvirtFibreChannelVolumeDriver,scality=nova.virt.libvirt.volume.LibvirtScalityVolumeDriver
-Index: etc/nova/api-paste.ini
-===================================================================
---- etc/nova/api-paste.ini.orig
-+++ etc/nova/api-paste.ini
-@@ -107,6 +107,8 @@ admin_password = %SERVICE_PASSWORD%
- # signing_dir is configurable, but the default behavior of the authtoken
- # middleware should be sufficient. It will create a temporary directory
- # in the home directory for the user the nova process is running as.
--#signing_dir = /var/lib/nova/keystone-signing
-+# ON SLE11 we need to it set explicitly as init script can have HOME variable
-+# inherited from calling shell (eg. root)
-+signing_dir = /var/lib/nova/keystone-signing
- # Workaround for https://bugs.launchpad.net/nova/+bug/1154809
- auth_version = v2.0
+@@ -2759,7 +2759,7 @@
+
+ # The SQLAlchemy connection string used to connect to the
+ # bare-metal database (string value)
+-#sql_connection=sqlite:///$state_path/baremetal_$sqlite_db
++sql_connection=sqlite:///$state_path/baremetal_$sqlite_db
+
+
+ #
++++++ nova-network-filter-bnc777488.patch ++++++
--- /var/tmp/diff_new_pack.XrH4hP/_old 2013-08-05 20:49:26.000000000 +0200
+++ /var/tmp/diff_new_pack.XrH4hP/_new 2013-08-05 20:49:26.000000000 +0200
@@ -1,35 +1,22 @@
-commit ff288f4ba40ec17d0be9d34a3911515449d50ac5
-Author: Bernhard M. Wiedemann <bwiedem...@suse.de>
-Date: Mon Apr 29 14:25:24 2013 +0200
-
- add sitelocal network rule
-
- this allows cloud admins to block certain traffic
- e.g. to prevent VMs to access private cloud infrastructure addrs
-
- Change-Id: Iff9b1dbb93f9cf0b8a6f037f16ff9460aef6b6df
-
-diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py
-index ccbe46d..df3471f 100644
---- a/nova/network/linux_net.py
-+++ b/nova/network/linux_net.py
-@@ -333,6 +333,11 @@ class IptablesManager(object):
+Index: nova-2013.2.a2481.ge685a72/nova/network/linux_net.py
+===================================================================
+--- nova-2013.2.a2481.ge685a72.orig/nova/network/linux_net.py
++++ nova-2013.2.a2481.ge685a72/nova/network/linux_net.py
+@@ -338,6 +338,9 @@ class IptablesManager(object):
# among the various nova components. It sits at the very top
# of FORWARD and OUTPUT.
for tables in [self.ipv4, self.ipv6]:
-+ tables['filter'].add_chain('nova-filter-FORWARD-sitelocl',
-+ wrap=False)
-+ tables['filter'].add_rule('FORWARD',
-+ '-j nova-filter-FORWARD-sitelocl', wrap=False, top=True)
++ tables['filter'].add_chain('nova-filter-FORWARD-sitelocl',
wrap=False)
++ tables['filter'].add_rule('FORWARD', '-j
nova-filter-FORWARD-sitelocl', wrap=False, top=True)
+
tables['filter'].add_chain('nova-filter-top', wrap=False)
tables['filter'].add_rule('FORWARD', '-j nova-filter-top',
wrap=False, top=True)
-diff --git a/nova/tests/test_iptables_network.py
b/nova/tests/test_iptables_network.py
-index 0aaae7d..4b00fe1 100644
---- a/nova/tests/test_iptables_network.py
-+++ b/nova/tests/test_iptables_network.py
-@@ -37,6 +37,8 @@ class IptablesManagerTestCase(test.TestCase):
+Index: nova-2013.2.a2481.ge685a72/nova/tests/test_iptables_network.py
+===================================================================
+--- nova-2013.2.a2481.ge685a72.orig/nova/tests/test_iptables_network.py
++++ nova-2013.2.a2481.ge685a72/nova/tests/test_iptables_network.py
+@@ -37,6 +37,8 @@ class IptablesManagerTestCase(test.TestC
':%s-local - [0:0]' % (binary_name),
':%s-OUTPUT - [0:0]' % (binary_name),
':nova-filter-top - [0:0]',
@@ -38,7 +25,7 @@
'[0:0] -A FORWARD -j nova-filter-top',
'[0:0] -A OUTPUT -j nova-filter-top',
'[0:0] -A nova-filter-top -j %s-local' % (binary_name),
-@@ -186,7 +188,15 @@ class IptablesManagerTestCase(test.TestCase):
+@@ -186,7 +188,15 @@ class IptablesManagerTestCase(test.TestC
"Duplicate line: %s" % line)
seen_lines.add(line)
@@ -55,7 +42,7 @@
for line in new_lines:
if line.startswith('[0:0] -A %s' % chain):
self.assertTrue('-j nova-filter-top' in line,
-@@ -225,7 +235,7 @@ class IptablesManagerTestCase(test.TestCase):
+@@ -225,7 +235,7 @@ class IptablesManagerTestCase(test.TestC
def test_iptables_top_order(self):
# Test iptables_top_regex
current_lines = list(self.sample_filter)
@@ -64,7 +51,7 @@
self.flags(iptables_top_regex='-j iptables-top-rule')
new_lines = self.manager._modify_rules(current_lines,
self.manager.ipv4['filter'],
-@@ -235,7 +245,7 @@ class IptablesManagerTestCase(test.TestCase):
+@@ -235,7 +245,7 @@ class IptablesManagerTestCase(test.TestC
def test_iptables_bottom_order(self):
# Test iptables_bottom_regex
current_lines = list(self.sample_filter)
@@ -73,7 +60,7 @@
self.flags(iptables_bottom_regex='-j iptables-bottom-rule')
new_lines = self.manager._modify_rules(current_lines,
self.manager.ipv4['filter'],
-@@ -245,8 +255,8 @@ class IptablesManagerTestCase(test.TestCase):
+@@ -245,8 +255,8 @@ class IptablesManagerTestCase(test.TestC
def test_iptables_preserve_order(self):
# Test both iptables_top_regex and iptables_bottom_regex
current_lines = list(self.sample_filter)
++++++ openstack-nova-network-init-bnc777488.patch ++++++
--- /var/tmp/diff_new_pack.XrH4hP/_old 2013-08-05 20:49:26.000000000 +0200
+++ /var/tmp/diff_new_pack.XrH4hP/_new 2013-08-05 20:49:26.000000000 +0200
@@ -1,6 +1,6 @@
---- openstack-nova-network.orig 2013-02-18 16:05:13.000000000 +0100
-+++ openstack-nova-network 2013-02-18 16:25:37.000000000 +0100
-@@ -22,9 +22,31 @@
+--- openstack-nova-network
++++ openstack-nova-network
+@@ -24,6 +24,27 @@
. /etc/rc.status
@@ -27,12 +27,16 @@
+
case "$1" in
start)
+ if [ "$DAEMON" == "api" ]; then
+@@ -33,6 +54,7 @@
+ fi
+
echo -n "Starting nova-$DAEMON"
+ iptables_setup I
/sbin/startproc -q -s -u $USER /usr/bin/nova-$DAEMON
--config-file=$CONFFILE
rc_status -v
;;
-@@ -32,6 +52,7 @@
+@@ -40,6 +62,7 @@
echo -n "Shutting down nova-$DAEMON"
/sbin/killproc /usr/bin/nova-$DAEMON
rc_status -v
@@ -40,3 +44,4 @@
;;
restart)
$0 stop
+Binary files a/.openstack-nova-network.un~ and b/.openstack-nova-network.un~
differ
++++++ openstack-nova-novncproxy.init ++++++
--- /var/tmp/diff_new_pack.XrH4hP/_old 2013-08-05 20:49:26.000000000 +0200
+++ /var/tmp/diff_new_pack.XrH4hP/_new 2013-08-05 20:49:26.000000000 +0200
@@ -1,10 +1,11 @@
#!/bin/sh
### BEGIN INIT INFO
-# Provides: openstack-novncproxy
+# Provides: openstack-nova-novncproxy
# Required-Start: $remote_fs $syslog
# Required-Stop: $remote_fs $syslog
-# Should-Start: rabbitmq-server mysql
+# Should-Start: mysql postgresql rabbitmq-server
+# Should-Stop: mysql postgresql rabbitmq-server
# Default-Start: 3 5
# Default-Stop: 0 1 2 6
# Short-Description: OpenStack Compute (Nova) - novncproxy
@@ -15,28 +16,20 @@
USER="openstack-nova"
CONFFILE="/etc/nova/nova.conf"
LOGFILE="/var/log/nova/$DAEMON.log"
-WEBROOT="/usr/share/novnc/"
-OPTIONS="--config-file=$CONFFILE --logfile=$LOGFILE --web=$WEBROOT --daemon"
-if [ "x$NOVNC_SSL_ENABLE" = "xyes" ] ; then
- SSL_KEY_FILE=`umask 077 >/dev/null ; mktemp
/dev/shm/openstack-novnc-key.XXXXXX`
- SSL_CRT_FILE=`umask 077 >/dev/null ; mktemp
/dev/shm/openstack-novnc-crt.XXXXXX`
- chown "$USER" "$SSL_KEY_FILE" "$SSL_CRT_FILE"
- OPTIONS="--cert $SSL_CRT_FILE --key $SSL_KEY_FILE ${OPTIONS}"
-fi
+OPTIONS="--config-file=$CONFFILE --logfile=$LOGFILE --nodaemon"
. /etc/rc.status
case "$1" in
start)
- echo -n "Starting $DAEMON"
- [ ! -z "$SSL_CRT_FILE" ] && [ ! -z "$SSL_KEY_FILE" ] && ( umask 077 ;
cp "$NOVNC_SSL_KEY" "$SSL_KEY_FILE" ; cp "$NOVNC_SSL_CERT" "$SSL_CRT_FILE" )
- startproc -w -u $USER /usr/bin/nova-$DAEMON $OPTIONS
+ echo -n "Starting nova-$DAEMON"
+ /sbin/startproc -q -u $USER /usr/bin/nova-$DAEMON $OPTIONS
rc_status -v
;;
stop)
- echo -n "Shutting down $DAEMON"
- killproc /usr/bin/nova-$DAEMON
+ echo -n "Shutting down nova-$DAEMON"
+ /sbin/killproc /usr/bin/nova-$DAEMON
rc_status -v
;;
restart)
@@ -47,21 +40,25 @@
reload)
;;
status)
- echo -n "Checking $DAEMON"
+ echo -n "Checking for service nova-$DAEMON"
/sbin/checkproc /usr/bin/nova-$DAEMON
rc_status -v
;;
- condrestart|try-restart)
+ try-restart|condrestart)
+ if test "$1" = "condrestart"; then
+ echo "${attn} Use try-restart ${done}(LSB)${attn} rather than
condrestart ${warn}(RH)${norm}"
+ fi
$0 status
if test $? = 0; then
$0 restart
else
rc_reset # Not running is not a failure.
fi
+ rc_status # Remember status and be quiet
;;
*)
- echo $"Usage: $0 {start|stop|status|restart|try-restart}"
- exit 2
+ echo "Usage: $0 {start|stop|status|try-restart|restart}"
+ exit 1
+ ;;
esac
-exit $?
-
+rc_exit
++++++ openstack-nova.init ++++++
--- /var/tmp/diff_new_pack.XrH4hP/_old 2013-08-05 20:49:26.000000000 +0200
+++ /var/tmp/diff_new_pack.XrH4hP/_new 2013-08-05 20:49:26.000000000 +0200
@@ -16,14 +16,22 @@
USER="openstack-nova"
CONFFILE="/etc/nova/nova.conf"
RUNDIR="/var/run/nova"
+LOCKDIR="/var/lock/nova"
-# $RUNDIR can be tmpfs, thus we have to create/own it here:
-mkdir -p $RUNDIR && chown $USER. $RUNDIR
+# $RUNDIR/$LOCKDIR can be tmpfs, thus we have to create/own it here:
+mkdir -m 0700 -p $RUNDIR && chown $USER. $RUNDIR
+mkdir -m 0700 -p $LOCKDIR && chown $USER. $LOCKDIR
. /etc/rc.status
case "$1" in
start)
+ if [ "$DAEMON" == "api" ]; then
+ echo -n "Checking for Nova API DB Migrations"
+ /usr/bin/nova-manage db sync
+ rc_status -v
+ fi
+
echo -n "Starting nova-$DAEMON"
/sbin/startproc -q -s -u $USER /usr/bin/nova-$DAEMON
--config-file=$CONFFILE
rc_status -v
++++++ remove-babel-runtime-dep.diff ++++++
diff -ruN a/requirements.txt b/requirements.txt
--- a/requirements.txt 2013-08-01 14:06:24.000000000 +0200
+++ b/requirements.txt 2013-08-01 16:23:47.096913428 +0200
@@ -19,7 +19,6 @@
suds>=0.4
paramiko
pyasn1
-Babel>=0.9.6
iso8601>=0.1.4
python-cinderclient>=1.0.1
python-neutronclient>=2.2.3,<3.0.0
++++++ websockify-05.diff ++++++
diff -ruN a/nova.egg-info/requires.txt b/nova.egg-info/requires.txt
--- a/nova.egg-info/requires.txt 2013-08-01 14:10:59.000000000 +0200
+++ b/nova.egg-info/requires.txt 2013-08-01 16:23:24.600913464 +0200
@@ -26,6 +26,6 @@
python-keystoneclient>=0.2.0
six
stevedore>=0.10
-websockify<0.4
+websockify>=0.5.1
pyparsing>=1.5.7,<2.0 # order-dependent python-quantumclient req, bug 1191866
-oslo.config>=1.2.0a3
\ No newline at end of file
+oslo.config>=1.2.0a3
diff -ruN a/requirements.txt b/requirements.txt
--- a/requirements.txt 2013-08-01 14:06:24.000000000 +0200
+++ b/requirements.txt 2013-08-01 16:23:31.744913452 +0200
@@ -27,7 +27,7 @@
python-keystoneclient>=0.2.0
six
stevedore>=0.10
-websockify<0.4
+websockify>=0.5.1
pyparsing>=1.5.7,<2.0 # order-dependent python-quantumclient req, bug 1191866
-f
http://tarballs.openstack.org/oslo.config/oslo.config-1.2.0a3.tar.gz#egg=oslo.config-1.2.0a3
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
