Hello community, here is the log from the commit of package openstack-nova for openSUSE:Factory checked in at 2013-04-29 14:09:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-nova (Old) and /work/SRC/openSUSE:Factory/.openstack-nova.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openstack-nova", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-nova/openstack-nova-doc.changes 2013-01-29 06:46:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-nova.new/openstack-nova-doc.changes 2013-04-29 14:09:49.000000000 +0200 @@ -2 +2 @@ -Fri Jan 18 13:42:51 UTC 2013 - [email protected] +Mon Mar 18 09:39:21 UTC 2013 - [email protected] @@ -4,6 +4 @@ -- Update to version 2012.2.3+git.1358515929.3545a7d: - + Add NFS to the libvirt volume driver list - + Call plug_vifs() for all instances in init_host - + Fix addition of CPU features when running against legacy libvirt - + Fix typo in resource tracker audit message -- Move back to "git_tarballs" source service. +- Drop +git.$TIMESTAMP.$COMMITHASH version suffix @@ -11,16 +6,2 @@ --------------------------------------------------------------------- -Thu Jan 17 15:22:36 UTC 2013 - [email protected] - -- Start using obs-service-github_tarballs - --------------------------------------------------------------------- -Thu Jan 17 14:52:08 UTC 2013 - [email protected] - -- Update to version 2012.2.3+git.1358434328.a41b913: - + Provide better error message for aggregate-create - + Fix errors in used_limits extension - + Add an iptables mangle rule per-bridge for DHCP. - + Limit formatting routes when adding resources - --------------------------------------------------------------------- -Thu Jan 3 12:17:48 UTC 2013 - [email protected] +------------------------------------------------------------------- +Fri Feb 22 10:26:40 UTC 2013 - [email protected] @@ -28,2 +9 @@ -- Update to version 2012.2.3+git.1357215468.451003e: - + Fix a crash when launching qcow2 images containing snapshots +- BuildRequire openstack-suse-macros instead of openstack-macros @@ -37 +17 @@ -Tue Dec 11 17:36:43 UTC 2012 - [email protected] +Tue Dec 11 17:36:43 UTC 2012 - [email protected] --- /work/SRC/openSUSE:Factory/openstack-nova/openstack-nova.changes 2013-04-17 23:13:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openstack-nova.new/openstack-nova.changes 2013-04-29 14:09:49.000000000 +0200 @@ -0,0 +1,15 @@ +------------------------------------------------------------------- +Thu Apr 4 16:34:42 UTC 2013 - [email protected] + +- update to grizzly-stable + +------------------------------------------------------------------- +Tue Apr 2 08:38:44 UTC 2013 - [email protected] + +- Update to version 2013.1.rc2 + +------------------------------------------------------------------- +Tue Mar 26 12:37:25 UTC 2013 - [email protected] + +- downgrade to 2013.1.rc1 + @@ -2 +17 @@ -Sun Mar 24 00:11:28 UTC 2013 - [email protected] +Tue Mar 26 10:50:54 CET 2013 - [email protected] @@ -4,5 +19 @@ -- Update to version 2012.2.4+git.1364083888.5b43cef: - + libvirt: enable apic setting for Xen or KVM guest. - + Fix double reboot issue during soft reboot - + Enable VM DHCP request to reach DHCP agent - + Handle compute node records with no timestamp. +- fixed openstack-nova-vncproxy.init @@ -11 +22 @@ -Thu Mar 14 21:53:59 UTC 2013 - [email protected] +Sun Mar 24 00:44:59 UTC 2013 - [email protected] @@ -13,4 +24,59 @@ -- Update to version 2012.2.4+git.1363298039.9561484: - + Fix an error in affinity filters - + Add quotas for fixed ips. (CVE-2013-1838) -- This fixes bnc#808622. +- Update to version 2013.2.a35.g4fedcd7+git.1364085899.4fedcd7: + + Change type of ssh_port option from Str to Int + + nova-manage vm list fails looking 'instance_type' + + Add caching for ec2 mapping ids. + + Make nova.virt.fake.FakeDriver useable in integration testing + + Change arguments to volume_detach() + + Fixes passing arbitrary conductor_api argument + + translate cinder BadRequest exception + + Initialize compute manager before loading driver. + + py2.6 doesn't support TextTestRunner resultclass + + Add a comment to placeholder migrations. + + Make _downsize_quota_delta() use stashed instance types + + Remove outdated try except block in ec2 code + +------------------------------------------------------------------- +Wed Mar 20 09:10:00 UTC 2013 - [email protected] + +- python-discover is only a test-dependency on platforms with Python < 2.7 + (SLE_11_SP2 in other words) + +-------------------------------------------------------------------- +Tue Mar 19 12:04:24 CET 2013 - [email protected] + +- added missing requirement novnc for package + openstack-nova-novncproxy + +-------------------------------------------------------------------- +Mon Mar 18 18:59:11 CET 2013 - [email protected] + +- added missing init scripts for following services + + consoleauth + + spicehtml5proxy +- moved consoleauth into separate subpackage + +-------------------------------------------------------------------- +Mon Mar 18 17:16:45 CET 2013 - [email protected] + +- fixed sysconfig file of openstack-nova-novncproxy +- added missing requirements of openstack-nova-novncproxy + +-------------------------------------------------------------------- +Mon Mar 18 09:39:03 UTC 2013 - [email protected] + +- Update to version 2013.1.a5126.ged1d6f2: + + Make ssh key injection work with xenapi agent + + Update migration 153 for efficiency. + + rstrip() strips characters, not strings + + Store project_id for instance actions + + Fix use of libvirt_disk_prefix + + Revert "Remove the usage of instance['extra_specs' + + Add standard methods to the Limits API + + Imported Translations from Transifex + + Check keypair destroy result operation +- Drop +git.$TIMESTAMP.$COMMITHASH version suffix + +-------------------------------------------------------------------- +Mon Mar 18 08:43:51 CET 2013 - [email protected] + +- mark /etc/nova/api-paste.ini as noreplace @@ -19 +85,59 @@ -Mon Mar 11 13:05:55 UTC 2013 - [email protected] +Sun Mar 17 11:29:54 UTC 2013 - [email protected] + +- Update to version 2013.1.a5108.g9ee8c94+git.1363519794.9ee8c94: + + xenapi: Fix reboot with hung volumes + + Fix: Managers that incorrectly derive from SchedulerDependentManager + + Delete instance metadata when delete VM + + Pin SQLAlchemy to 0.7.x + + Fix nova-manage --version + + Switch to final 1.1.0 oslo.config release + + Sync rpc from oslo-incubator. + + Fix reconnecting to libvirt. + + Lazy load CONF.quota_driver. + + Skip deleted fixed ip address for os-fixed-ips extension + + Prepare services index method for use with cells + + Fix behaviour of split_cell_and_item + + Update to Quantum Client 2.2.0 + + Add missing tests for db.block_device_mapping_* methods + + List ComputeHostNotFound as a client exception + + Virtual Power Driver list running vms quoting error + + Make run_instance() bail quietly if instance has been deleted + + Fix use of potentially-stale instance_type in tenant_usage + + Refactor work with session in db.block_device_mapping_* methods + + Don't load system_metadata when it isn't joined. + + Fix: Nova aggregate API throws an uncaught exception on invalid host + + List ConsoleTypeInvalid as a client exception. + + Force nova to use keystone v2.0 for auth_token + + Remove sqlalchemy calling back to DB API + + Fix cells instance deletion + + Resize/Migrate refactoring fixes and test cases + + Generalize console error handling during build. + + Don't log traceback on expected console error. + + Fix copyright - from LLC to Foundation + + Read instance resource quota info from "quota" namespace. + + Makes safe xml data calls raise 400 http error instead of 500 + + Do not accept invalid keys in quota-update + + Fixes an iSCSI connector issue in the Hyper-V driver. + + Add the serial to connection info for boot volumes + + Don't include traceback when wrapping exceptions + + Fix system_metadata "None" and created_at values + + Do cleaning up resource before rescheduling. + + Add quotas for fixed ips. + + Fixes Hyper-V live migration with attached volumes + + Imported Translations from Transifex + + Fix exception message in Networks API extension + + Add missing API doc for networks-post-req. + + Fixes instance task_state being left as migrating + + Fix OS-DCF:diskconfig XML handling + + Drop gzip flag from tar command for OVF archives + + Fix: improve API error responses from os-hosts extension + + Make conductor's quota methods pass project_id properly + + Make os-services API extensions consistent. + + Fix db archiving bug with foreign key constraints. + + Revert 1154253 causes XenServer image compat issue + + Remove the usage of instance['extra_specs']. +- remove sqlalchemy-update.diff: + + merged upstream + +------------------------------------------------------------------- +Fri Mar 15 17:46:31 UTC 2013 - [email protected] @@ -21,2 +145,114 @@ -- Update to version 2012.2.4+git.1363007155.c06b205: - + Avoid vm instance shutdown when power state is NOSTATE +- change ownership of /var/cache/nova dir to the openstack-nova user + +------------------------------------------------------------------- +Thu Mar 14 16:54:55 UTC 2013 - [email protected] + +- fix cache directory and change it in the config file, too + +------------------------------------------------------------------- +Thu Mar 14 16:18:42 UTC 2013 - [email protected] + +- add /var/cache/nova/api dir for authentication cache + +-------------------------------------------------------------------- +Thu Mar 14 09:19:00 CET 2013 - [email protected] + +- added missing dependency python-pyasn1 to python-nova + +-------------------------------------------------------------------- +Wed Mar 13 00:18:38 UTC 2013 - [email protected] + +- Update to version 2013.1.a5007.g071719a+git.1363133918.071719a: + + Add numerous fixes to test_api_samples + + Pass migration_ref when when auto-confirming + + Handle vcpu counting failures gracefully + + Return XML message with objectserver 404. + + Rename LLC to Foundation + + Deprecate CONF.fixed_range, do dynamic setup + + Remove instance['instance_type'] relationship from db api + + Force resource updates to update updated_at + + Fixes nbd device can't be released error + + websockify 0.4 is busted + + Compile BigInteger to INTEGER for sqlite + + Fix quota issues with instance deletes. + + Fix: nova-manage throws uncaught exception on invalid host/service + +-------------------------------------------------------------------- +Tue Mar 12 00:02:43 UTC 2013 - [email protected] + +- Update to version 2013.1.a4981.g2d7b7a1+git.1363046563.2d7b7a1: + + Rewrap two lines. + + Correct exception args in vfs/guestfs. ++++ 966 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: ---- nova-stable-folsom.tar.gz nova.conf sysconfig.openstack-novncproxy New: ---- nova-conf-defaults.patch nova-stable-grizzly.tar.gz nova-sudoers sysconfig.openstack-nova-novncproxy ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-nova-doc.spec ++++++ --- /var/tmp/diff_new_pack.HSroL3/_old 2013-04-29 14:09:52.000000000 +0200 +++ /var/tmp/diff_new_pack.HSroL3/_new 2013-04-29 14:09:52.000000000 +0200 @@ -20,15 +20,15 @@ %define majorversion 2012.2.3 Name: openstack-%{component}-doc -Version: 2012.2.4+git.1364083888.5b43cef -Release: 1 -License: Apache-2.0 +Version: 2013.1.1.a1.g4216ba7 +Release: 0 Summary: OpenStack Compute (Nova) - Documentation -Url: http://openstack.org/projects/compute/ +License: Apache-2.0 Group: Documentation/HTML -Source: nova-stable-folsom.tar.gz +Url: http://openstack.org/projects/compute/ +Source: nova-stable-grizzly.tar.gz BuildRequires: graphviz -BuildRequires: openstack-macros +BuildRequires: openstack-suse-macros BuildRequires: python-Cheetah BuildRequires: python-PasteDeploy BuildRequires: python-Sphinx @@ -47,8 +47,8 @@ BuildRequires: python-mox BuildRequires: python-netaddr #BuildRequires: python-nova -BuildRequires: python-openssl BuildRequires: python-paste +BuildRequires: python-pyOpenSSL #BuildRequires: python-qpid #BuildRequires: python-quantumclient BuildRequires: python-routes @@ -65,7 +65,7 @@ This package contains documentation files for openstack-nova. %prep -%setup -q -n nova-2012.2.4 +%setup -q -n nova-2013.1.1.a1.g4216ba7 %openstack_cleanup_prep %build ++++++ openstack-nova.spec ++++++ ++++ 616 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/openstack-nova/openstack-nova.spec ++++ and /work/SRC/openSUSE:Factory/.openstack-nova.new/openstack-nova.spec ++++++ _service ++++++ --- /var/tmp/diff_new_pack.HSroL3/_old 2013-04-29 14:09:52.000000000 +0200 +++ /var/tmp/diff_new_pack.HSroL3/_new 2013-04-29 14:09:52.000000000 +0200 @@ -1,6 +1,7 @@ <services> <service name="git_tarballs" mode="disabled"> - <param name="url">http://tarballs.openstack.org/nova/nova-stable-folsom.tar.gz</param> - <param name="email">[email protected]</param> + <param name="url">http://tarballs.openstack.org/nova/nova-stable-grizzly.tar.gz</param> + <param name="email">[email protected]</param> + <param name="plain-version">True</param> </service> </services> ++++++ nova-conf-defaults.patch ++++++ --- etc/nova/nova.conf.sample.orig +++ etc/nova/nova.conf.sample @@ -65,7 +65,7 @@ # # ip address of this host (string value) -#my_ip=10.0.0.1 +my_ip=<IP> # 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 @@ #pybasedir=/usr/lib/python/site-packages # Directory where nova binaries are installed (string value) -#bindir=$pybasedir/bin +bindir=/usr/bin # Top-level directory for maintaining nova's state (string # value) -#state_path=$pybasedir +state_path=/var/lib/nova # @@ -330,7 +330,7 @@ # The strategy to use for auth: noauth or keystone. (string # value) -#auth_strategy=noauth +auth_strategy=keystone # Treat X-Forwarded-For as the canonical remote address. Only # enable this if you have a sanitizing proxy. (boolean value) @@ -857,7 +857,7 @@ # hostname or ip for openstack to use when accessing the s3 # api (string value) -#s3_host=$my_ip +s3_host=$my_ip # port used when accessing the s3 api (integer value) #s3_port=3333 @@ -890,7 +890,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 # @@ -1081,10 +1081,10 @@ #vpn_start=1000 # Number of addresses in each private subnet (integer value) -#network_size=256 +network_size=5000 # Fixed IP address block (string value) -#fixed_range=10.0.0.0/8 +fixed_range=192.168.0.0/24 # Fixed IPv6 address block (string value) #fixed_range_v6=fd00::/48 @@ -1148,7 +1148,7 @@ # # URL for connecting to quantum (string value) -#quantum_url=http://127.0.0.1:9696 +quantum_url=http://<IP>:9696 # timeout value for connecting to quantum in seconds (integer # value) @@ -1156,15 +1156,15 @@ # username for connecting to quantum in admin context (string # value) -#quantum_admin_username=<None> +quantum_admin_username=quantum # password for connecting to quantum 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 # region name for connecting to quantum in admin context # (string value) @@ -1179,7 +1179,7 @@ # auth strategy for connecting to quantum in admin context # (string value) -#quantum_auth_strategy=keystone +quantum_auth_strategy=keystone # Name of Integration Bridge used by Open vSwitch (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 @@ # Directory to use for lock files. Default to a temp directory # (string value) -#lock_path=<None> +lock_path=/var/run/nova # @@ -1363,7 +1363,7 @@ # Print more verbose output (set logging level to INFO instead # of default WARNING level). (boolean value) -#verbose=false +verbose=true # Log output to standard error (boolean value) #use_stderr=true @@ -1427,7 +1427,7 @@ # (Optional) The directory to keep log files in (will be # prepended to --log-file) (string value) -#log_dir=<None> +log_dir=/var/log/nova # Use syslog for logging. (boolean value) #use_syslog=false @@ -1524,7 +1524,7 @@ # The RabbitMQ broker address where a single node is used # (string value) -#rabbit_host=localhost +rabbit_host=$my_ip # The RabbitMQ broker port where a single node is used # (integer value) @@ -1862,7 +1862,7 @@ # include: libvirt.LibvirtDriver, xenapi.XenAPIDriver, # fake.FakeDriver, baremetal.BareMetalDriver, # vmwareapi.VMWareESXDriver (string value) -#compute_driver=<None> +compute_driver=libvirt.LibvirtDriver # The default format an ephemeral_volume will be formatted # with on creation. (string value) @@ -2000,7 +2000,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 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 ++++++ nova-network-filter-bnc777488.patch ++++++ --- /var/tmp/diff_new_pack.HSroL3/_old 2013-04-29 14:09:52.000000000 +0200 +++ /var/tmp/diff_new_pack.HSroL3/_new 2013-04-29 14:09:52.000000000 +0200 @@ -1,8 +1,8 @@ -Index: nova-2012.1+git.1345844892.4d2a4af/nova/network/linux_net.py +Index: nova-2013.1.a4665.g42d058b/nova/network/linux_net.py =================================================================== ---- nova-2012.1+git.1345844892.4d2a4af.orig/nova/network/linux_net.py -+++ nova-2012.1+git.1345844892.4d2a4af/nova/network/linux_net.py -@@ -262,6 +262,9 @@ class IptablesManager(object): +--- nova-2013.1.a4665.g42d058b.orig/nova/network/linux_net.py ++++ nova-2013.1.a4665.g42d058b/nova/network/linux_net.py +@@ -323,6 +323,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]: @@ -12,11 +12,11 @@ tables['filter'].add_chain('nova-filter-top', wrap=False) tables['filter'].add_rule('FORWARD', '-j nova-filter-top', wrap=False, top=True) -Index: nova-2012.1+git.1345844892.4d2a4af/nova/tests/test_iptables_network.py +Index: nova-2013.1.a4665.g42d058b/nova/tests/test_iptables_network.py =================================================================== ---- nova-2012.1+git.1345844892.4d2a4af.orig/nova/tests/test_iptables_network.py -+++ nova-2012.1+git.1345844892.4d2a4af/nova/tests/test_iptables_network.py -@@ -144,7 +144,15 @@ class IptablesManagerTestCase(test.TestC +--- nova-2013.1.a4665.g42d058b.orig/nova/tests/test_iptables_network.py ++++ nova-2013.1.a4665.g42d058b/nova/tests/test_iptables_network.py +@@ -157,7 +157,15 @@ class IptablesManagerTestCase(test.TestC "Duplicate line: %s" % line) seen_lines.add(line) ++++++ nova-sudoers ++++++ openstack-nova ALL = (root) NOPASSWD: /usr/bin/nova-rootwrap /etc/nova/rootwrap.conf * ++++++ openstack-nova-network-init-bnc777488.patch ++++++ --- /var/tmp/diff_new_pack.HSroL3/_old 2013-04-29 14:09:52.000000000 +0200 +++ /var/tmp/diff_new_pack.HSroL3/_new 2013-04-29 14:09:52.000000000 +0200 @@ -1,8 +1,8 @@ ---- openstack-nova-network.orig 2012-08-17 15:38:54.000000000 +0000 -+++ openstack-nova-network 2012-08-28 18:06:45.000000000 +0000 -@@ -45,9 +45,31 @@ - FULLNAME="OpenStack::Nova $name server" - CHUSER="-u $USER" +--- 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 @@ + + . /etc/rc.status +iptables_setup() +{ @@ -27,14 +27,14 @@ + case "$1" in start) - echo -n "Starting $FULLNAME" + echo -n "Starting nova-$DAEMON" + iptables_setup I - startproc -s $CHUSER -t ${STARTUP_TIMEOUT:-5} -q /usr/bin/nova-$name $OPTIONS + /sbin/startproc -q -s -u $USER /usr/bin/nova-$DAEMON --config-file=$CONFFILE rc_status -v ;; -@@ -55,6 +77,7 @@ - echo -n "Shutting down $FULLNAME" - killproc /usr/bin/nova-$name +@@ -32,6 +52,7 @@ + echo -n "Shutting down nova-$DAEMON" + /sbin/killproc /usr/bin/nova-$DAEMON rc_status -v + iptables_setup D ;; ++++++ openstack-nova-novncproxy.init ++++++ --- /var/tmp/diff_new_pack.HSroL3/_old 2013-04-29 14:09:52.000000000 +0200 +++ /var/tmp/diff_new_pack.HSroL3/_new 2013-04-29 14:09:52.000000000 +0200 @@ -7,25 +7,17 @@ # Should-Start: rabbitmq-server mysql # Default-Start: 3 5 # Default-Stop: 0 1 2 6 -# Short-Description: Nova novncproxy server -# Description: Nova novncproxy server. +# Short-Description: OpenStack Compute (Nova) - novncproxy +# Description: OpenStack Compute (Nova) - novncproxy ### END INIT INFO -name="novncproxy" +DAEMON="novncproxy" USER="openstack-nova" -GROUP="nobody" -CONFIGFILE="/etc/nova/nova.conf" -RUNDIR="/var/run/nova" -LOGFILE="/var/log/nova/$name.log" -WEBROOT="/var/lib/nova/noVNC" -DAEMON="nova-novncproxy" +CONFFILE="/etc/nova/nova.conf" +LOGFILE="/var/log/nova/$DAEMON.log" +WEBROOT="/usr/share/novnc/" -[ -e "/etc/sysconfig/openstack-$name" ] && . "/etc/sysconfig/openstack-$name" - -mkdir -p $RUNDIR - -DAEMON_OPTIONS="--config-file=$CONFIGFILE --logfile=$LOGFILE --web=$WEBROOT --daemon" -OPTIONS="${OPTIONS} $DAEMON_OPTIONS" +OPTIONS="--config-file=$CONFFILE --logfile=$LOGFILE --web=$WEBROOT --nodaemon" 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` @@ -33,32 +25,18 @@ OPTIONS="--cert $SSL_CRT_FILE --key $SSL_KEY_FILE ${OPTIONS}" fi -# Shell functions sourced from /etc/rc.status: -# rc_check check and set local and overall rc status -# rc_status check and set local and overall rc status -# rc_status -v be verbose in local rc status and clear it afterwards -# rc_status -v -r ditto and clear both the local and overall rc status -# rc_status -s display "skipped" and exit with status 3 -# rc_status -u display "unused" and exit with status 3 -# rc_failed set local and overall rc status to failed -# rc_failed <num> set local and overall rc status to <num> -# rc_reset clear both the local and overall rc status -# rc_exit exit appropriate to overall rc status -# rc_active checks whether a service is activated by symlinks . /etc/rc.status -FULLNAME="OpenStack::Nova $name server" - 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 -u $USER /usr/bin/$DAEMON $OPTIONS </dev/null >/dev/null 2>&1 & + startproc -u $USER /usr/bin/nova-$DAEMON $OPTIONS rc_status -v ;; stop) echo -n "Shutting down $DAEMON" - killproc python /usr/bin/$DAEMON 2>/dev/null + killproc /usr/bin/nova-$DAEMON rc_status -v ;; restart) @@ -70,7 +48,7 @@ ;; status) echo -n "Checking $DAEMON" - /sbin/checkproc python /usr/bin/$DAEMON + /sbin/checkproc /usr/bin/nova-$DAEMON rc_status -v ;; condrestart|try-restart) @@ -86,3 +64,4 @@ exit 2 esac exit $? + ++++++ openstack-nova.init ++++++ --- /var/tmp/diff_new_pack.HSroL3/_old 2013-04-29 14:09:52.000000000 +0200 +++ /var/tmp/diff_new_pack.HSroL3/_new 2013-04-29 14:09:52.000000000 +0200 @@ -2,86 +2,71 @@ ### BEGIN INIT INFO # Provides: openstack-nova-__NAME__ -# Required-Start: $network $remote_fs $syslog +# Required-Start: $remote_fs $syslog # Required-Stop: $remote_fs $syslog -# Should-Start: rabbitmq-server mysql postgresql -# Should-Stop: rabbitmq-server mysql postgresql +# Should-Start: mysql postgresql rabbitmq-server +# Should-Stop: mysql postgresql rabbitmq-server # Default-Start: 3 5 # Default-Stop: 0 1 2 6 -# Short-Description: Nova __NAME__ server -# Description: Nova __NAME__ server. +# Short-Description: OpenStack Compute (Nova) - __NAME__ +# Description: OpenStack Compute (Nova) - __NAME__ ### END INIT INFO -name="__NAME__" +DAEMON="__NAME__" USER="openstack-nova" -GROUP="nobody" -CONFIGFILE="/etc/nova/nova.conf" +CONFFILE="/etc/nova/nova.conf" RUNDIR="/var/run/nova" -LOGFILE="/var/log/nova/$name.log" -[ -e "/etc/sysconfig/openstack-nova-$name" ] && . "/etc/sysconfig/openstack-nova-$name" +# $RUNDIR can be tmpfs, thus we have to create/own it here: +mkdir -p $RUNDIR && chown $USER. $RUNDIR -[ -e $LOGFILE ] || touch $LOGFILE -mkdir -p $RUNDIR -chown $USER. $RUNDIR $LOGFILE - -DAEMON_OPTIONS="--config-file=$CONFIGFILE --logfile=$LOGFILE" -OPTIONS="${OPTIONS} $DAEMON_OPTIONS" - -# Shell functions sourced from /etc/rc.status: -# rc_check check and set local and overall rc status -# rc_status check and set local and overall rc status -# rc_status -v be verbose in local rc status and clear it afterwards -# rc_status -v -r ditto and clear both the local and overall rc status -# rc_status -s display "skipped" and exit with status 3 -# rc_status -u display "unused" and exit with status 3 -# rc_failed set local and overall rc status to failed -# rc_failed <num> set local and overall rc status to <num> -# rc_reset clear both the local and overall rc status -# rc_exit exit appropriate to overall rc status -# rc_active checks whether a service is activated by symlinks . /etc/rc.status -FULLNAME="OpenStack::Nova $name server" -CHUSER="-u $USER" - case "$1" in start) - echo -n "Starting $FULLNAME" - startproc -s $CHUSER -t ${STARTUP_TIMEOUT:-5} -q /usr/bin/nova-$name $OPTIONS + echo -n "Starting nova-$DAEMON" + /sbin/startproc -q -s -u $USER /usr/bin/nova-$DAEMON --config-file=$CONFFILE rc_status -v ;; stop) - echo -n "Shutting down $FULLNAME" - killproc /usr/bin/nova-$name + echo -n "Shutting down nova-$DAEMON" + /sbin/killproc /usr/bin/nova-$DAEMON rc_status -v ;; restart) $0 stop - $0 start - rc_status + $0 start + rc_status + ;; + force-reload) + $0 try-restart + rc_status ;; reload) + echo -n "Reload service nova-$DAEMON" + rc_failed 3 + rc_status -v ;; status) - echo -n "Checking $FULLNAME" - /sbin/checkproc /usr/bin/nova-$name - rc_status -v - ;; - condrestart|try-restart) - 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 - ;; + echo -n "Checking for service nova-$DAEMON" + /sbin/checkproc /usr/bin/nova-$DAEMON + rc_status -v + ;; + 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|condrestart|try-restart}" - exit 2 + echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" + exit 1 + ;; esac -exit $? +rc_exit ++++++ openstack-nova.logrotate ++++++ --- /var/tmp/diff_new_pack.HSroL3/_old 2013-04-29 14:09:52.000000000 +0200 +++ /var/tmp/diff_new_pack.HSroL3/_new 2013-04-29 14:09:52.000000000 +0200 @@ -1,5 +1,12 @@ +compress + /var/log/nova/*.log { - daily + rotate 15 + size 1M + weekly + dateext missingok + notifempty su openstack-nova openstack-nova + sharedscripts } ++++++ sysconfig.openstack-nova-novncproxy ++++++ ## Path: System/Management ## Description: OpenStack noVNC Proxy ## Type: yesno ## Default: "no" # # Enable SSL for noVNC Proxy. # NOVNC_SSL_ENABLE="no" ## Type: string ## Default: "" # # Path to certificate for noVNC Proxy in SSL mode. # NOVNC_SSL_CERT="" ## Type: string ## Default: "" # # Path to the key for noVNC Proxy in SSL mode. # NOVNC_SSL_KEY="" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
