Attachment 179137 Details for Bug 216314 – py-nova-14.0.3

[patch] py-nova-14.0.3

py-nova-14.0.3.diff (text/plain), 4.33 KB, created by Alexander Nusov on 2017-01-20 14:08:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Nusov

Created: 2017-01-20 14:08:48 UTC

Size: 4.33 KB

patch

obsolete

>Index: emulators/py-nova/Makefile
>===================================================================
>--- emulators/py-nova/Makefile	(revision 431727)
>+++ emulators/py-nova/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	nova
>-PORTVERSION=	14.0.2
>+PORTVERSION=	14.0.3
> CATEGORIES=	emulators python
> MASTER_SITES=	https://fossies.org/linux/misc/openstack/
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -79,7 +79,8 @@
> 		${FILESDIR}/03-nova-conf.patch:-p1 \
> 		${FILESDIR}/04-xen-phy.patch:-p1 \
> 		${FILESDIR}/05-online-cpus.patch:-p1 \
>-		${FILESDIR}/06-freebsd-net.patch:-p1
>+		${FILESDIR}/06-freebsd-net.patch:-p1 \
>+		${FILESDIR}/07-fix-xen-xvd.patch:-p1
> 
> ONLY_FOR_ARCHS=	amd64
> 
>@@ -94,7 +95,8 @@
> 		nova-compute \
> 		nova-cert \
> 		nova-cells \
>-		nova-serialproxy
>+		nova-serialproxy \
>+		nova-novncproxy
> USERS=		nova
> GROUPS=		nova
> 
>Index: emulators/py-nova/distinfo
>===================================================================
>--- emulators/py-nova/distinfo	(revision 431727)
>+++ emulators/py-nova/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1478994869
>-SHA256 (nova-14.0.2.tar.gz) = e98291734b4b16615fb1518161c89749f09ad33b6344feb70d62b69e8161a50d
>-SIZE (nova-14.0.2.tar.gz) = 5574197
>+TIMESTAMP = 1484666036
>+SHA256 (nova-14.0.3.tar.gz) = e5a93e747824cb77a0d389a3e74eaaa63954048530df942533c68bda1534e826
>+SIZE (nova-14.0.3.tar.gz) = 5584926
>Index: emulators/py-nova/files/07-fix-xen-xvd.patch
>===================================================================
>--- emulators/py-nova/files/07-fix-xen-xvd.patch	(nonexistent)
>+++ emulators/py-nova/files/07-fix-xen-xvd.patch	(working copy)
>@@ -0,0 +1,18 @@
>+diff --git a/nova/virt/block_device.py b/nova/virt/block_device.py
>+index f6ed6a3..6539fca 100644
>+--- a/nova/virt/block_device.py
>++++ b/nova/virt/block_device.py
>+@@ -228,7 +228,12 @@ class DriverVolumeBlockDevice(DriverBlockDevice):
>+             {k: v for k, v in six.iteritems(self._bdm_obj)
>+              if k in self._new_fields | set(['delete_on_termination'])}
>+         )
>+-        self['mount_device'] = self._bdm_obj.device_name
>++
>++        device_name = self._bdm_obj.device_name
>++        if self['disk_bus'] == 'xen':
>++            device_name = device_name.replace("/dev/vd", "/dev/xvd")
>++        self['mount_device'] = device_name
>++
>+         try:
>+             self['connection_info'] = jsonutils.loads(
>+                 self._bdm_obj.connection_info)
>
>Property changes on: emulators/py-nova/files/07-fix-xen-xvd.patch
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: emulators/py-nova/files/nova-novncproxy.in
>===================================================================
>--- emulators/py-nova/files/nova-novncproxy.in	(nonexistent)
>+++ emulators/py-nova/files/nova-novncproxy.in	(working copy)
>@@ -0,0 +1,53 @@
>+#!/bin/sh
>+#
>+# $FreeBSD$
>+#
>+
>+# PROVIDE: nova_novncproxy
>+# REQUIRE: LOGIN
>+# KEYWORD: shutdown
>+
>+#
>+# Add the following lines to /etc/rc.conf to enable nova_novncproxy:
>+#
>+# nova_novncproxy_enable="YES"
>+#
>+# nova_novncproxy_enable (bool):
>+#	Set it to "YES" to enable nova_novncproxy.
>+# 	Default is "NO".
>+#
>+# nova_novncproxy_logdir (str):
>+#	Set it to chagge log directory
>+#	Default is "/var/log/nova"
>+#
>+# nova_novncproxy_args (str):
>+#	Set it to change command line arguments.
>+#	Default is "--log-file ${nova_novncproxy_logdir}/nova-novncproxy.log"
>+#
>+
>+. /etc/rc.subr
>+
>+name=nova_novncproxy
>+rcvar=nova_novncproxy_enable
>+
>+PATH=%%PREFIX%%/bin:%%PREFIX%%/sbin:$PATH
>+
>+pidfile="/var/run/nova-novncproxy.pid"
>+procname="%%PREFIX%%/bin/python2.7"
>+
>+start_precmd=nova_precmd
>+
>+load_rc_config $name
>+
>+: ${nova_novncproxy_enable:="NO"}
>+: ${nova_novncproxy_logdir:="/var/log/nova"}
>+: ${nova_novncproxy_args:="--log-file ${nova_novncproxy_logdir}/nova-novncproxy.log"}
>+
>+command="/usr/sbin/daemon"
>+command_args="-f -p ${pidfile} nova-novncproxy ${nova_novncproxy_args}"
>+
>+nova_precmd() {
>+	mkdir -p ${nova_novncproxy_logdir}
>+}
>+
>+run_rc_command "$1"
>
>Property changes on: emulators/py-nova/files/nova-novncproxy.in
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 216314: 179137