Hello community, here is the log from the commit of package openstack-nova for openSUSE:Factory checked in at 2013-01-17 15:16:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-nova (Old) and /work/SRC/openSUSE:Factory/.openstack-nova.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openstack-nova", Maintainer is "cth...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-nova/openstack-nova-doc.changes 2012-11-15 09:43:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-nova.new/openstack-nova-doc.changes 2013-01-17 15:16:27.000000000 +0100 @@ -0,0 +1,6 @@ +-------------------------------------------------------------------- +Thu Jan 3 12:17:48 UTC 2013 - cloud-de...@suse.de + +- Update to version 2012.2.3+git.1357215468.451003e: + + Fix a crash when launching qcow2 images containing snapshots + @@ -2 +8,39 @@ -Thu Nov 8 13:26:09 UTC 2012 - sasc...@suse.de +Wed Dec 19 15:36:47 UTC 2012 - sasc...@suse.de + +- It's a noarch package + +-------------------------------------------------------------------- +Tue Dec 11 17:36:43 UTC 2012 - cloud-de...@suse.de + +- Move to obs-service-git_tarballs + + Drop BuildRequires: python-setuptools-git +- Update to version 2012.2.3+git.1355243803.9e62846: + + Bump version to 2012.2.3 + + Final versioning for 2012.2.2 + + Don't leak info from libvirt LVM backed instances + +-------------------------------------------------------------------- +Mon Dec 10 17:20:47 UTC 2012 - iartar...@suse.com + +- Update to latest git (670b388): + + Fix rpc control_exchange regression. + +------------------------------------------------------------------- +Thu Dec 6 13:51:20 UTC 2012 - iartar...@suse.com + +- Fix version name + +------------------------------------------------------------------- +Fri Nov 16 12:52:08 UTC 2012 - sasc...@suse.de + +- Add more documentation requirements but disable some, currently + the build fails if too much is enabled (I/O error) + +------------------------------------------------------------------- +Thu Nov 15 13:26:43 UTC 2012 - sasc...@suse.de + +- Use openstack-macros +- Additional documentation requirements + +------------------------------------------------------------------- +Thu Nov 8 11:49:52 UTC 2012 - sasc...@suse.de --- /work/SRC/openSUSE:Factory/openstack-nova/openstack-nova.changes 2012-11-15 09:43:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-nova.new/openstack-nova.changes 2013-01-17 15:16:27.000000000 +0100 @@ -2 +2,78 @@ -Thu Nov 8 13:26:02 UTC 2012 - sasc...@suse.de +Tue Jan 15 08:01:05 UTC 2013 - vu...@suse.com + +- Drop nova-migration-config.patch: the patch is not used anymore, + as we don't need it anymore with the _service we're using now. + +-------------------------------------------------------------------- +Thu Jan 3 12:17:48 UTC 2013 - cloud-de...@suse.de + +- Switch to github_tarballs source service +- Update to version 2012.2.3+git.1357215468.451003e: + + Fix a crash when launching qcow2 images containing snapshots + +------------------------------------------------------------------- +Wed Dec 19 14:49:49 UTC 2012 - sasc...@suse.de + +- Use macro %openstack_sphinx_build_manpages_only + +------------------------------------------------------------------- +Wed Dec 19 11:57:05 UTC 2012 - sasc...@suse.de + +- Move to obs-service-git_tarballs + + Drop BuildRequires: python-setuptools-git + + Drop %majorversion macro +- Fix testsuite requirements + +------------------------------------------------------------------- +Wed Dec 19 09:05:52 UTC 2012 - bwiedem...@suse.com + +- update init scripts and nova.conf for Folsom + +-------------------------------------------------------------------- +Tue Dec 11 17:36:43 UTC 2012 - cloud-de...@suse.de + +- Use new git_tarballs source service +- Update to version 2012.2.3+git.1355243803.9e62846: + + Bump version to 2012.2.3 + + Final versioning for 2012.2.2 + + Don't leak info from libvirt LVM backed instances + +-------------------------------------------------------------------- +Mon Dec 10 17:20:47 UTC 2012 - iartar...@suse.com + +- Update to latest git (670b388): + + Fix rpc control_exchange regression. + +------------------------------------------------------------------- +Thu Dec 6 11:44:38 UTC 2012 - iartar...@suse.com + +- Set the version to seconds from epoch + +------------------------------------------------------------------- +Thu Dec 6 11:03:34 UTC 2012 - iartar...@suse.com + +- Use upstream tarballs instead of the git repository + +------------------------------------------------------------------- +Wed Dec 5 09:36:59 UTC 2012 - sasc...@suse.de + +- Use @PARENT_TAG@ in _service file to automate versioning + +------------------------------------------------------------------- +Mon Dec 3 14:44:22 UTC 2012 - iartar...@suse.com + +- Add sqlalchemy-migrate config to the python package + +------------------------------------------------------------------- +Thu Nov 15 12:39:52 UTC 2012 - sasc...@suse.de + +- Use openstack-macros + +------------------------------------------------------------------- +Fri Nov 9 10:24:55 UTC 2012 - sasc...@suse.de + +- Add more test requirements for which we have packages now: + + Requires: python-nosehtmloutput + +------------------------------------------------------------------- +Thu Nov 8 11:36:41 UTC 2012 - sasc...@suse.de @@ -7 +84,7 @@ -Tue Nov 6 10:48:22 UTC 2012 - sasc...@suse.de +Tue Oct 30 09:21:25 UTC 2012 - sasc...@suse.de + +- Drop temporary fixes for file permissions and attributes in %post + section. They were necessary only to migrate from pre-1.0 packages. + +------------------------------------------------------------------- +Wed Oct 17 10:23:12 UTC 2012 - sasc...@suse.de @@ -9 +92,2 @@ -- Correctly apply last patch +- Drop "%fdupes doc/build/html", HTML documentaion is build in seperate + spec file @@ -12 +96 @@ -Wed Oct 31 09:39:19 UTC 2012 - mbarrin...@suse.com +Tue Oct 9 15:28:56 UTC 2012 - vu...@suse.com @@ -14,2 +98,11 @@ -- Added nova-bnc-780982-fix.patch: boot from volume not possible - from dashboard (bnc#780982) +- Update to version 2012.2 (Folsom): + + See https://github.com/openstack/nova/commits/folsom-3 +- Drop the following upstreamed patches: + + jsonutils-fix-new-anyjson.patch + + nova-glance-ssl.patch + + nova-volume-list-all_tenants.patch +- Buildrequire python-base instead of python-devel: + + Sufficient for Python-only modules (containing no C/C++ code) +- Migration of /etc/sysconfig/openstack-novncproxy to + openstack-nova-novncproxy +- Move some Requires from base package to python-nova Old: ---- 5b85997e-power_state.patch disable-intersphinx.patch jsonutils-fix-new-anyjson.patch nova-2012.1+git.1348669189.d1d5d6d.tar.gz nova-bnc-780982-fix.patch nova-glance-ssl.patch nova-volume-list-all_tenants.patch nova-xen.patch show stable.tar.gz New: ---- nova-stable-folsom.tar.gz openstack-nova-novncproxy.init sysconfig.openstack-novncproxy ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-nova-doc.spec ++++++ --- /var/tmp/diff_new_pack.8ELG1M/_old 2013-01-17 15:16:30.000000000 +0100 +++ /var/tmp/diff_new_pack.8ELG1M/_new 2013-01-17 15:16:30.000000000 +0100 @@ -17,39 +17,43 @@ %define component nova +%define majorversion 2012.2.3 Name: openstack-%{component}-doc -Version: 2012.1+git.1348669189.d1d5d6d +Version: 2012.2.3+git.1357215468.451003e Release: 0 -Summary: Documentation for OpenStack Nova License: Apache-2.0 -Group: Documentation/HTML +Summary: OpenStack Compute (Nova) - Documentation Url: http://openstack.org/projects/compute/ -Source: %{component}-%{version}.tar.gz -# PATCH-FIX-OPENSUSE: To build in OBS without internet access -# the intersphinx module connects to the internet and tries to link to -# other existing sphinx documentation for external modules. We obviously -# don't want to connect to the internet during package build. -Patch0: disable-intersphinx.patch -# PATCH-FIX-UPSTREAM jsonutils-fix-new-anyjson.patch lp#1017765 vu...@suse.com -- Fix compatibility with new python-anyjson -Patch1: jsonutils-fix-new-anyjson.patch +Group: Documentation/HTML +Source: nova-stable-folsom.tar.gz BuildRequires: graphviz -BuildRequires: libvirt-python +BuildRequires: openstack-macros +BuildRequires: python-Cheetah BuildRequires: python-PasteDeploy BuildRequires: python-Sphinx -BuildRequires: python-devel -BuildRequires: python-glance -# For nova.rpc.impl_kombu: -BuildRequires: python-kombu -# For nova.network.ldapdns: +#BuildRequires: python-SQLAlchemy +BuildRequires: python-WebOb +BuildRequires: python-base +BuildRequires: python-boto +#BuildRequires: python-cinderclient +BuildRequires: python-distribute +BuildRequires: python-eventlet +BuildRequires: python-feedparser +#BuildRequires: python-glanceclient +BuildRequires: python-iso8601 BuildRequires: python-ldap BuildRequires: python-lxml -BuildRequires: python-nova -BuildRequires: python-novaclient -# For api.volume.san: -BuildRequires: python-paramiko -BuildRequires: python-pycrypto -BuildRequires: python-suds +BuildRequires: python-mox +BuildRequires: python-netaddr +#BuildRequires: python-nova +BuildRequires: python-openssl +BuildRequires: python-paste +#BuildRequires: python-qpid +#BuildRequires: python-quantumclient +BuildRequires: python-routes +#BuildRequires: python-zmq +BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -61,11 +65,8 @@ This package contains documentation files for openstack-nova. %prep -%setup -q -n %{component}-%{version} -%patch0 -p1 -%patch1 -p1 -# Avoid usage of 'git' to generate timestamps: -sed -i "s|html_last_updated_fmt = .*|html_last_updated_fmt = '%{version}'|" doc/source/conf.py +%setup -q -n nova-2012.2.3 +%openstack_cleanup_prep %build python setup.py build_sphinx ++++++ openstack-nova.spec ++++++ ++++ 641 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.8ELG1M/_old 2013-01-17 15:16:30.000000000 +0100 +++ /var/tmp/diff_new_pack.8ELG1M/_new 2013-01-17 15:16:30.000000000 +0100 @@ -1,22 +1,9 @@ <services> - <service name="tar_scm" mode="disabled"> - <param name="url">git://github.com/openstack/nova.git</param> - <param name="scm">git</param> - <param name="exclude">.git</param> - <param name="exclude">.gitreview</param> - <param name="version">git-stable</param> - <param name="versionformat">2012.1+git.%ct.%h</param> - - <!-- Comment this if you want the latest git master. --> - <param name="revision">stable/essex</param> - </service> - - <service name="recompress" mode="disabled"> - <param name="file">nova-*git*.tar</param> - <param name="compression">gz</param> - </service> - - <service name="set_version" mode="disabled"> - <param name="basename">nova</param> + <service name="github_tarballs" mode="disabled"> + <param name="url">http://tarballs.openstack.org/nova/nova-stable-folsom.tar.gz</param> + <param name="email">cloud-de...@suse.de</param> + <param name="repo_owner">openstack</param> + <param name="repo_name">nova</param> + <param name="target">stable/folsom</param> </service> </services> ++++++ nova-network-filter-bnc777488.patch ++++++ --- /var/tmp/diff_new_pack.8ELG1M/_old 2013-01-17 15:16:30.000000000 +0100 +++ /var/tmp/diff_new_pack.8ELG1M/_new 2013-01-17 15:16:30.000000000 +0100 @@ -23,7 +23,7 @@ - for chain in ['FORWARD', 'OUTPUT']: + for chain in ['FORWARD']: + for line in new_lines: -+ if line.startswith('-A %s' % chain): ++ if line.startswith('[0:0] -A %s' % chain): + self.assertTrue('-j nova-filter-FORWARD-sitelocl' in line, + "First %s rule does not " + "jump to nova-filter-FORWARD-sitelocl" % chain) @@ -31,5 +31,5 @@ + + for chain in ['OUTPUT']: for line in new_lines: - if line.startswith('-A %s' % chain): + if line.startswith('[0:0] -A %s' % chain): self.assertTrue('-j nova-filter-top' in line, ++++++ nova-rbd-use-local-devices.patch ++++++ --- /var/tmp/diff_new_pack.8ELG1M/_old 2013-01-17 15:16:30.000000000 +0100 +++ /var/tmp/diff_new_pack.8ELG1M/_new 2013-01-17 15:16:30.000000000 +0100 @@ -16,38 +16,11 @@ nova/volume/driver.py | 6 ++++ 4 files changed, 68 insertions(+), 1 deletions(-) -Index: nova-2012.1+git.1343445424.b68e9c6/nova/rootwrap/compute.py +Index: nova-2012.2+git.1349813491.b7e509a/nova/virt/libvirt/volume.py =================================================================== ---- nova-2012.1+git.1343445424.b68e9c6.orig/nova/rootwrap/compute.py -+++ nova-2012.1+git.1343445424.b68e9c6/nova/rootwrap/compute.py -@@ -113,6 +113,9 @@ filterlist = [ - # nova/virt/libvirt/connection.py: 'dd', "if=%s" % virsh_output, ... - filters.CommandFilter("/bin/dd", "root"), - -+ # nova/virt/libvirt/volume.py: 'rbd', "map/showmapped", ... -+ filters.CommandFilter("/usr/bin/rbd", "root"), -+ - # nova/virt/xenapi/volume_utils.py: 'iscsiadm', '-m', ... - filters.CommandFilter("/sbin/iscsiadm", "root"), - -Index: nova-2012.1+git.1343445424.b68e9c6/nova/virt/libvirt/connection.py -=================================================================== ---- nova-2012.1+git.1343445424.b68e9c6.orig/nova/virt/libvirt/connection.py -+++ nova-2012.1+git.1343445424.b68e9c6/nova/virt/libvirt/connection.py -@@ -142,7 +142,7 @@ libvirt_opts = [ - 'iscsi=nova.virt.libvirt.volume.LibvirtISCSIVolumeDriver', - 'local=nova.virt.libvirt.volume.LibvirtVolumeDriver', - 'fake=nova.virt.libvirt.volume.LibvirtFakeVolumeDriver', -- 'rbd=nova.virt.libvirt.volume.LibvirtNetVolumeDriver', -+ 'rbd=nova.virt.libvirt.volume.LibvirtRbdVolumeDriver', - 'sheepdog=nova.virt.libvirt.volume.LibvirtNetVolumeDriver' - ], - help='Libvirt handlers for remote volumes.'), -Index: nova-2012.1+git.1343445424.b68e9c6/nova/virt/libvirt/volume.py -=================================================================== ---- nova-2012.1+git.1343445424.b68e9c6.orig/nova/virt/libvirt/volume.py -+++ nova-2012.1+git.1343445424.b68e9c6/nova/virt/libvirt/volume.py -@@ -28,6 +28,8 @@ from nova import utils +--- nova-2012.2+git.1349813491.b7e509a.orig/nova/virt/libvirt/volume.py ++++ nova-2012.2+git.1349813491.b7e509a/nova/virt/libvirt/volume.py +@@ -30,6 +30,8 @@ from nova.virt.libvirt import utils as v LOG = logging.getLogger(__name__) FLAGS = flags.FLAGS flags.DECLARE('num_iscsi_scan_tries', 'nova.volume.driver') @@ -56,9 +29,9 @@ class LibvirtVolumeDriver(object): -@@ -68,6 +70,62 @@ class LibvirtFakeVolumeDriver(LibvirtVol - </disk>""" % (protocol, name, mount_device) - return xml +@@ -71,6 +73,62 @@ class LibvirtFakeVolumeDriver(LibvirtVol + conf.serial = connection_info.get('serial') + return conf +class LibvirtRbdVolumeDriver(LibvirtVolumeDriver): + """Driver to attach RBD volumes to libvirt.""" @@ -119,11 +92,11 @@ class LibvirtNetVolumeDriver(LibvirtVolumeDriver): """Driver to attach Network volumes to libvirt.""" -Index: nova-2012.1+git.1343445424.b68e9c6/nova/volume/driver.py +Index: nova-2012.2+git.1349813491.b7e509a/nova/volume/driver.py =================================================================== ---- nova-2012.1+git.1343445424.b68e9c6.orig/nova/volume/driver.py -+++ nova-2012.1+git.1343445424.b68e9c6/nova/volume/driver.py -@@ -64,6 +64,10 @@ volume_opts = [ +--- nova-2012.2+git.1349813491.b7e509a.orig/nova/volume/driver.py ++++ nova-2012.2+git.1349813491.b7e509a/nova/volume/driver.py +@@ -67,6 +67,10 @@ volume_opts = [ default=None, help='the libvirt uuid of the secret for the rbd_user' 'volumes'), @@ -131,10 +104,10 @@ + default=None, + help='path the file containing the secret for the rbd_user' + 'volumes'), - ] - - FLAGS = flags.FLAGS -@@ -554,6 +558,8 @@ class RBDDriver(VolumeDriver): + cfg.StrOpt('volume_tmp_dir', + default=None, + help='where to store temporary image files if the volume ' +@@ -724,6 +728,8 @@ class RBDDriver(VolumeDriver): 'driver_volume_type': 'rbd', 'data': { 'name': '%s/%s' % (FLAGS.rbd_pool, volume['name']), @@ -143,3 +116,17 @@ 'auth_enabled': FLAGS.rbd_secret_uuid is not None, 'auth_username': FLAGS.rbd_user, 'secret_type': 'ceph', +Index: nova-2012.2+git.1349813491.b7e509a/etc/nova/rootwrap.d/compute.filters +=================================================================== +--- nova-2012.2+git.1349813491.b7e509a.orig/etc/nova/rootwrap.d/compute.filters ++++ nova-2012.2+git.1349813491.b7e509a/etc/nova/rootwrap.d/compute.filters +@@ -101,6 +101,9 @@ ovs-ofctl: CommandFilter, /usr/bin/ovs-o + # nova/virt/libvirt/connection.py: 'dd', if=%s % virsh_output, ... + dd: CommandFilter, /bin/dd, root + ++# nova/virt/libvirt/volume.py: 'rbd', "map/showmapped", ... ++rbd: CommandFilter, /usr/bin/rbd, root ++ + # nova/virt/xenapi/volume_utils.py: 'iscsiadm', '-m', ... + iscsiadm: CommandFilter, /sbin/iscsiadm, root + iscsiadm_usr: CommandFilter, /usr/bin/iscsiadm, root ++++++ nova.conf ++++++ --- /var/tmp/diff_new_pack.8ELG1M/_old 2013-01-17 15:16:30.000000000 +0100 +++ /var/tmp/diff_new_pack.8ELG1M/_new 2013-01-17 15:16:30.000000000 +0100 @@ -1,19 +1,34 @@ +[DEFAULT] # example nova.conf # replace the values ---daemonize=1 ---dhcpbridge_flagfile=/etc/nova/nova.conf ---dhcpbridge=/usr/bin/nova-dhcpbridge ---logdir=/var/log/nova ---state_path=/var/lib/nova ---lock_path=/var/run/nova ---root_helper=sudo /usr/bin/nova-rootwrap ---verbose ---sql_connection=mysql://root:<mysql-password>@<IP>/nova ---s3_host=<IP> ---rabbit_host=<IP> ---ec2_url=http://<IP>:8773/services/Cloud ---network_manager=nova.network.manager.VlanManager ---fixed_range=192.168.0.0/24 ---network_size=5000 ---libvirt_type=kvm -#--bridge_interface=br0 +verbose=True +auth_strategy=keystone +api_paste_config=/etc/nova/api-paste.ini +rootwrap_config=/etc/nova/rootwrap.conf +compute_scheduler_driver=nova.scheduler.filter_scheduler.FilterScheduler +fixed_range=192.168.0.0/24 +dhcpbridge_flagfile=/etc/nova/nova.conf +dhcpbridge=/usr/bin/nova-dhcpbridge +logdir=/var/log/nova +state_path=/var/lib/nova +lock_path=/var/run/nova +#instances_path=/var/lib/nova/instances +root_helper=sudo /usr/bin/nova-rootwrap +sql_connection=mysql://root:<mysql-password>@<IP>/nova +s3_host=<IP> +#s3_port=3333 +osapi_compute_extension=nova.api.openstack.compute.contrib.standard_extensions +my_ip=<IP> +rabbit_host=<IP> +#rabbit_password= +glance_api_servers=<IP> +ec2_url=http://<IP>:8773/services/Cloud +network_manager=nova.network.manager.FlatDHCPManager +fixed_range=192.168.0.0/24 +network_size=5000 +compute_driver=libvirt.LibvirtDriver +libvirt_type=kvm +#libvirt_cpu_mode=none +instance_name_template=instance-%08x +enabled_apis=ec2,osapi_compute,metadata +#bridge_interface=br0 ++++++ openstack-nova-novncproxy.init ++++++ #!/bin/sh ### BEGIN INIT INFO # Provides: openstack-novncproxy # Required-Start: $remote_fs $syslog # Required-Stop: $remote_fs $syslog # Should-Start: rabbitmq-server mysql # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: Nova novncproxy server # Description: Nova novncproxy server. ### END INIT INFO name="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" [ -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" 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 # 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 & rc_status -v ;; stop) echo -n "Shutting down $DAEMON" killproc python /usr/bin/$DAEMON 2>/dev/null rc_status -v ;; restart) $0 stop $0 start rc_status ;; reload) ;; status) echo -n "Checking $DAEMON" /sbin/checkproc python /usr/bin/$DAEMON rc_status -v ;; condrestart|try-restart) $0 status if test $? = 0; then $0 restart else rc_reset # Not running is not a failure. fi ;; *) echo $"Usage: $0 {start|stop|status|restart|try-restart}" exit 2 esac exit $? ++++++ openstack-nova-vncproxy.init ++++++ --- /var/tmp/diff_new_pack.8ELG1M/_old 2013-01-17 15:16:30.000000000 +0100 +++ /var/tmp/diff_new_pack.8ELG1M/_new 2013-01-17 15:16:30.000000000 +0100 @@ -15,7 +15,7 @@ name="vncproxy" USER="openstack-nova" GROUP="nobody" -FLAGFILE="/etc/nova/nova.conf" +CONFIGFILE="/etc/nova/nova.conf" RUNDIR="/var/run/nova" LOGFILE="/var/log/nova/$name.log" @@ -24,7 +24,7 @@ mkdir -p $RUNDIR DAEMON="/usr/bin/nova-xvpvncproxy" -DAEMON_OPTIONS="--flagfile=$FLAGFILE --logfile=$LOGFILE" +DAEMON_OPTIONS="--config-file=$CONFIGFILE --logfile=$LOGFILE" OPTIONS="${OPTIONS} $DAEMON_OPTIONS" # Shell functions sourced from /etc/rc.status: ++++++ openstack-nova.init ++++++ --- /var/tmp/diff_new_pack.8ELG1M/_old 2013-01-17 15:16:30.000000000 +0100 +++ /var/tmp/diff_new_pack.8ELG1M/_new 2013-01-17 15:16:30.000000000 +0100 @@ -15,7 +15,7 @@ name="__NAME__" USER="openstack-nova" GROUP="nobody" -FLAGFILE="/etc/nova/nova.conf" +CONFIGFILE="/etc/nova/nova.conf" RUNDIR="/var/run/nova" LOGFILE="/var/log/nova/$name.log" @@ -25,7 +25,7 @@ mkdir -p $RUNDIR chown $USER. $RUNDIR $LOGFILE -DAEMON_OPTIONS="--flagfile=$FLAGFILE --logfile=$LOGFILE" +DAEMON_OPTIONS="--config-file=$CONFIGFILE --logfile=$LOGFILE" OPTIONS="${OPTIONS} $DAEMON_OPTIONS" # Shell functions sourced from /etc/rc.status: ++++++ sysconfig.openstack-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: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
