Index: head/emulators/py-nova/Makefile =================================================================== --- head/emulators/py-nova/Makefile (revision 432010) +++ head/emulators/py-nova/Makefile (revision 432011) @@ -1,141 +1,143 @@ # Created by: Alexander Nusov # $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} MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= OpenStack compute service LICENSE= APACHE20 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr RUN_DEPENDS:= ${BUILD_DEPENDS} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10 \ ${PYTHON_PKGNAMEPREFIX}boto>=2.32.1:devel/py-boto \ ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator \ ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2 \ ${PYTHON_PKGNAMEPREFIX}keystonemiddleware>=0:devel/py-keystonemiddleware \ ${PYTHON_PKGNAMEPREFIX}lxml>=2.3:devel/py-lxml \ ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes \ ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography \ ${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob \ ${PYTHON_PKGNAMEPREFIX}greenlet>=0.3.2:devel/py-greenlet \ ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy \ ${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste \ ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable \ ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate \ ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr \ ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.4:net/py-netifaces \ ${PYTHON_PKGNAMEPREFIX}paramiko>=2.0:security/py-paramiko \ ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel \ ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 \ ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema \ ${PYTHON_PKGNAMEPREFIX}python-cinderclient>=0:net/py-python-cinderclient \ ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1 \ ${PYTHON_PKGNAMEPREFIX}python-neutronclient>=5.1.0:net/py-python-neutronclient \ ${PYTHON_PKGNAMEPREFIX}python-glanceclient>=0:net/py-python-glanceclient \ ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore \ ${PYTHON_PKGNAMEPREFIX}websockify>=0.8.0:devel/py-websockify \ ${PYTHON_PKGNAMEPREFIX}oslo.cache>=1.5.0:devel/py-oslo.cache \ ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \ ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context \ ${PYTHON_PKGNAMEPREFIX}oslo.log>=1.14.0:devel/py-oslo.log \ ${PYTHON_PKGNAMEPREFIX}oslo.reports>=0.6.0:devel/py-oslo.reports \ ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils \ ${PYTHON_PKGNAMEPREFIX}oslo.db>=0:devel/py-oslo.db \ ${PYTHON_PKGNAMEPREFIX}oslo.rootwrap>=5.0.0:devel/py-oslo.rootwrap \ ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.2.0:devel/py-oslo.messaging \ ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.9.0:devel/py-oslo.policy \ ${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.9.0:devel/py-oslo.privsep \ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service \ ${PYTHON_PKGNAMEPREFIX}rfc3986>=0.2.2:www/py-rfc3986 \ ${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.0.0:devel/py-oslo.middleware \ ${PYTHON_PKGNAMEPREFIX}psutil121>=0:sysutils/py-psutil121 \ ${PYTHON_PKGNAMEPREFIX}oslo.versionedobjects>=1.13.0:devel/py-oslo.versionedobjects \ ${PYTHON_PKGNAMEPREFIX}os-brick>=1.6.1:devel/py-os-brick \ ${PYTHON_PKGNAMEPREFIX}os-vif>=1.1.0:devel/py-os-vif \ ${PYTHON_PKGNAMEPREFIX}os-win>=0.2.3:devel/py-os-win \ ${PYTHON_PKGNAMEPREFIX}castellan>=0.4.0:devel/py-castellan \ ${PYTHON_PKGNAMEPREFIX}microversion-parse>=0.1.2:devel/py-microversion-parse \ ${PYTHON_PKGNAMEPREFIX}wsgi_intercept>=0.6.1:devel/py-wsgi_intercept \ ${PYTHON_PKGNAMEPREFIX}sqlparse>=0:databases/py-sqlparse \ ${PYTHON_PKGNAMEPREFIX}libvirt>=0:devel/py-libvirt \ e2fsprogs>=0:sysutils/e2fsprogs \ arping>=0:net/arping EXTRA_PATCHES= ${FILESDIR}/01-firewall-manager.patch:-p1 \ ${FILESDIR}/02-freebsd-l3.patch:-p1 \ ${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 USES= python USE_PYTHON= autoplist distutils noegginfo USE_RC_SUBR= nova-api \ nova-consoleauth \ nova-conductor \ nova-scheduler \ nova-network \ nova-compute \ nova-cert \ nova-cells \ - nova-serialproxy + nova-serialproxy \ + nova-novncproxy USERS= nova GROUPS= nova .include .if ${OPSYS} != FreeBSD IGNORE= only supported on FreeBSD .endif .if ${OSVERSION} < 1100055 IGNORE= only supported on recent FreeBSD 11 .endif post-extract: @(cd ${WRKSRC}/etc/nova; ${MV} logging_sample.conf logging.conf.sample) @(cd ${WRKSRC}/etc/nova; for f in *.conf; do ${MV} $${f} $${f}.sample; done) post-patch: ${CP} ${FILESDIR}/nova.conf.sample \ ${WRKSRC}/etc/nova/nova.conf.sample ${CP} ${FILESDIR}/nova-compute.conf.sample \ ${WRKSRC}/etc/nova/nova-compute.conf.sample ${REINPLACE_CMD} -e "s|/etc|${PREFIX}/etc|g" \ ${WRKSRC}/nova/api/openstack/placement/wsgi.py \ ${WRKSRC}/nova/conf/base.py \ ${WRKSRC}/nova/conf/cloudpipe.py \ ${WRKSRC}/nova/conf/network.py \ ${WRKSRC}/nova/conf/remote_debug.py \ ${WRKSRC}/nova/conf/xvp.py \ ${WRKSRC}/nova/hacking/checks.py \ ${WRKSRC}/nova/network/linux_net.py \ ${WRKSRC}/nova/network/manager.py \ ${WRKSRC}/nova/virt/disk/api.py \ ${WRKSRC}/nova/virt/disk/vfs/guestfs.py \ ${WRKSRC}/nova/virt/libvirt/driver.py \ ${WRKSRC}/nova/virt/xenapi/agent.py \ ${WRKSRC}/nova/wsgi/nova-api.py \ ${WRKSRC}/nova/wsgi/nova-metadata.py post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${CP} -R ${WRKSRC}/etc/nova/ ${STAGEDIR}${ETCDIR} .include Index: head/emulators/py-nova/distinfo =================================================================== --- head/emulators/py-nova/distinfo (revision 432010) +++ head/emulators/py-nova/distinfo (revision 432011) @@ -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: head/emulators/py-nova/files/07-fix-xen-xvd.patch =================================================================== --- head/emulators/py-nova/files/07-fix-xen-xvd.patch (nonexistent) +++ head/emulators/py-nova/files/07-fix-xen-xvd.patch (revision 432011) @@ -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: head/emulators/py-nova/files/07-fix-xen-xvd.patch ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property 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: head/emulators/py-nova/files/nova-novncproxy.in =================================================================== --- head/emulators/py-nova/files/nova-novncproxy.in (nonexistent) +++ head/emulators/py-nova/files/nova-novncproxy.in (revision 432011) @@ -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: head/emulators/py-nova/files/nova-novncproxy.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property 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