From owner-svn-ports-all@freebsd.org Sat Jan 21 04:14:36 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DE423CBA816; Sat, 21 Jan 2017 04:14:36 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9F284161B; Sat, 21 Jan 2017 04:14:36 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0L4EZaQ015894; Sat, 21 Jan 2017 04:14:35 GMT (envelope-from novel@FreeBSD.org) Received: (from novel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0L4EZUP015890; Sat, 21 Jan 2017 04:14:35 GMT (envelope-from novel@FreeBSD.org) Message-Id: <201701210414.v0L4EZUP015890@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: novel set sender to novel@FreeBSD.org using -f From: Roman Bogorodskiy Date: Sat, 21 Jan 2017 04:14:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432011 - in head/emulators/py-nova: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Jan 2017 04:14:37 -0000 Author: novel Date: Sat Jan 21 04:14:35 2017 New Revision: 432011 URL: https://svnweb.freebsd.org/changeset/ports/432011 Log: emulators/py-nova: update to 14.0.3 - update to 14.0.3 - add nova-novncproxy service - fix booting from cinder volumes PR: 216314 Submitted by: maintainer Added: head/emulators/py-nova/files/07-fix-xen-xvd.patch (contents, props changed) head/emulators/py-nova/files/nova-novncproxy.in (contents, props changed) Modified: head/emulators/py-nova/Makefile head/emulators/py-nova/distinfo Modified: head/emulators/py-nova/Makefile ============================================================================== --- head/emulators/py-nova/Makefile Sat Jan 21 03:25:47 2017 (r432010) +++ head/emulators/py-nova/Makefile Sat Jan 21 04:14:35 2017 (r432011) @@ -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 @@ EXTRA_PATCHES= ${FILESDIR}/01-firewall-m ${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 @@ USE_RC_SUBR= nova-api \ nova-compute \ nova-cert \ nova-cells \ - nova-serialproxy + nova-serialproxy \ + nova-novncproxy USERS= nova GROUPS= nova Modified: head/emulators/py-nova/distinfo ============================================================================== --- head/emulators/py-nova/distinfo Sat Jan 21 03:25:47 2017 (r432010) +++ head/emulators/py-nova/distinfo Sat Jan 21 04:14:35 2017 (r432011) @@ -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 Added: head/emulators/py-nova/files/07-fix-xen-xvd.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/py-nova/files/07-fix-xen-xvd.patch Sat Jan 21 04:14:35 2017 (r432011) @@ -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) Added: head/emulators/py-nova/files/nova-novncproxy.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/py-nova/files/nova-novncproxy.in Sat Jan 21 04:14:35 2017 (r432011) @@ -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"