Attachment #178597 for bug #215850

Lines 144-150 Link Here

(-)GIDs (-2 / +2 lines)
144	sympa:*:200:	144	sympa:*:200:
145	privoxy:*:201:	145	privoxy:*:201:
146	dspam:*:202:	146	dspam:*:202:
147	# free: 203	147	cinder:*:203:
148	yate:*:204:	148	yate:*:204:
149	gnugk:*:205:	149	gnugk:*:205:
150	gini:*:206:	150	gini:*:206:
Lines 361-367 Link Here
361	# free: 417	361	# free: 417
362	# free: 418	362	# free: 418
363	# free: 419	363	# free: 419
364	oxidized:*:420:	364	# free: 420
365	# free: 421	365	# free: 421
366	# free: 422	366	# free: 422
367	# free: 423	367	# free: 423




sympa:*:200:200::0:0:Sympa Owner:/nonexistent:/usr/sbin/nologin
privoxy:*:201:201::0:0:Privoxy proxy user:/nonexistent:/usr/sbin/nologin
dspam:*:202:202::0:0:Dspam:/nonexistent:/usr/sbin/nologin
cinder:*:203:203::0:0:Cinder daemon pseudo-user:/var/lib/cinder:/usr/sbin/nologin
yate:*:204:204::0:0:Yate:/nonexistent:/usr/sbin/nologin
gnugk:*:205:205::0:0:GNU GateKeeper pseudo-user:/nonexistent:/usr/sbin/nologin
gini:*:206:206::0:0:& streaming server:/var/log/gini:/usr/sbin/nologin

# free: 417
# free: 418
# free: 419
# free: 420
# free: 421
# free: 422
# free: 423

mapred:*:947:955::0:0:Hadoop MapReduce user:/nonexistent:/usr/sbin/nologin
dnrd:*:948:948::0:0:& user:/nonexistent:/usr/sbin/nologin
_lldpd:*:949:949::0:0:lldpd user:/nonexistent:/usr/sbin/nologin
# free: 950
openerpd:*:951:951::0:0:Openerpd user:/nonexistent:/usr/sbin/nologin
bitten-slave:*:952:952:daemon:0:0:Bitten slave user:/var/lib/bitten-slave:/usr/sbin/nologin
_neubot:*:953:953::0:0:neubot daemon:/nonexistent:/usr/sbin/nologin




# Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
# $FreeBSD$

PORTNAME=	oslo.vmware
PORTVERSION=	2.16.0
CATEGORIES=	devel python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

MAINTAINER=	alexander.nusov@nfvexpress.com
COMMENT=	Oslo VMware library

LICENSE=	APACHE20

BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urllib3>=1.15.1:net/py-urllib3 \
		${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \
		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \
		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
		${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \
		${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr \
		${PYTHON_PKGNAMEPREFIX}lxml>=2.3:devel/py-lxml \
		${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet \
		${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml \
		${PYTHON_PKGNAMEPREFIX}suds-jurko>=0.6:devel/py-suds-jurko

NO_ARCH=	yes

USES=		python
USE_PYTHON=	autoplist distutils

.include <bsd.port.mk>

Line 0 Link Here

(-)devel/py-oslo.vmware/distinfo (+3 lines)
	1	TIMESTAMP = 1481137692
	2	SHA256 (oslo.vmware-2.16.0.tar.gz) = 53cbc0278187e94041b0877cb15b1e417c87d6726e12b522997112f9cda2f807
	3	SIZE (oslo.vmware-2.16.0.tar.gz) = 202785

Line 0 Link Here

(-)devel/py-oslo.vmware/pkg-descr (+3 lines)
	1	The Oslo VMware library provides support for common VMware operations and APIs.
	2
	3	WWW: http://pypi.python.org/pypi/oslo.vmware




# Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
# $FreeBSD$

PORTNAME=	rtslib-fb
PORTVERSION=	2.1.47
CATEGORIES=	devel python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

MAINTAINER=	alexander.nusov@nfvexpress.com
COMMENT=	API for Linux kernel SCSI target (aka lio)

LICENSE=	APACHE20

NO_ARCH=	yes

USES=		python
USE_PYTHON=	autoplist distutils

.include <bsd.port.mk>

Line 0 Link Here

(-)devel/py-rtslib-fb/distinfo (+3 lines)
	1	TIMESTAMP = 1481289462
	2	SHA256 (rtslib-fb-2.1.47.tar.gz) = 63348b0c88b542caa0729f8d3fa94623c4c616ed8e22757b41acf456928e576a
	3	SIZE (rtslib-fb-2.1.47.tar.gz) = 27131

Line 0 Link Here

(-)devel/py-rtslib-fb/pkg-descr (+3 lines)
	1	API for Linux kernel SCSI target (aka LIO)
	2
	3	WWW: http://pypi.python.org/pypi/rtslib-fb




# Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
# $FreeBSD$

PORTNAME=	suds-jurko
PORTVERSION=	0.6
CATEGORIES=	devel python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

MAINTAINER=	alexander.nusov@nfvexpress.com
COMMENT=	Lightweight SOAP client (jurko's fork)

NO_ARCH=	yes

USES=		python tar:bz2
USE_PYTHON=	autoplist distutils

.include <bsd.port.mk>

Line 0 Link Here

(-)devel/py-suds-jurko/distinfo (+3 lines)
	1	TIMESTAMP = 1481385855
	2	SHA256 (suds-jurko-0.6.tar.bz2) = 29edb72fd21e3044093d86f33c66cf847c5aaab26d64cb90e69e528ef014e57f
	3	SIZE (suds-jurko-0.6.tar.bz2) = 143985

Line 0 Link Here

(-)devel/py-suds-jurko/pkg-descr (+3 lines)
	1	Lightweight SOAP client written in Python (jurko's fork).
	2
	3	WWW: http://pypi.python.org/pypi/suds-jurko




# Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
# $FreeBSD$

PORTNAME=	tenacity
PORTVERSION=	3.4.0
CATEGORIES=	devel python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

MAINTAINER=	alexander.nusov@nfvexpress.com
COMMENT=	Task retrying for python library

LICENSE=	APACHE20

BUILD_DEPENDS=  ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
RUN_DEPENDS:=	${BUILD_DEPENDS}

NO_ARCH=	yes

USES=		python
USE_PYTHON=	autoplist distutils

.include <bsd.port.mk>

Line 0 Link Here

(-)devel/py-tenacity/distinfo (+3 lines)
	1	TIMESTAMP = 1481138391
	2	SHA256 (tenacity-3.4.0.tar.gz) = 72918085efeaaebcfd241ea04256151935826e428b81d1e18f3e924cb7a1f4c4
	3	SIZE (tenacity-3.4.0.tar.gz) = 21074

Line 0 Link Here

(-)devel/py-tenacity/pkg-descr (+5 lines)
	1	Tenacity is an Apache 2.0 licensed general-purpose retrying library, written
	2	in Python, to simplify the task of adding retry behavior to just about
	3	anything. It originates from a fork of Retrying.
	4
	5	WWW: http://pypi.python.org/pypi/tenacity




# Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
# $FreeBSD$

PORTNAME=	tooz
PORTVERSION=	1.46.0
CATEGORIES=	devel python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

MAINTAINER=	alexander.nusov@nfvexpress.com
COMMENT=	Coordination library for distributed systems

LICENSE=	APACHE20

BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}futures>=3.0:devel/py-futures \
		${PYTHON_PKGNAMEPREFIX}enum34>=0:devel/py-enum34 \
		${PYTHON_PKGNAMEPREFIX}voluptuous>=0.8.9:devel/py-voluptuous \
		${PYTHON_PKGNAMEPREFIX}tenacity>=3.2.1:devel/py-tenacity \
		${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore \
		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.15.0:devel/py-oslo.utils \
		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \
		${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.4.0:devel/py-msgpack-python \
		${PYTHON_PKGNAMEPREFIX}futurist>=0:devel/py-futurist \
		${PYTHON_PKGNAMEPREFIX}fasteners>=0.7:devel/py-fasteners

NO_ARCH=	yes

USES=		python
USE_PYTHON=	autoplist distutils

.include <bsd.port.mk>

Line 0 Link Here

(-)devel/py-tooz/distinfo (+3 lines)
	1	TIMESTAMP = 1481138411
	2	SHA256 (tooz-1.46.0.tar.gz) = 8bdc097bf217f2c8d8754c6328f0e5b58fb28add36231ef2b445984fa429b089
	3	SIZE (tooz-1.46.0.tar.gz) = 70298

Line 0 Link Here

(-)devel/py-tooz/pkg-descr (+5 lines)
	1	The Tooz project aims at centralizing the most common distributed primitives
	2	like group membership protocol, lock service and leader election by providing
	3	a coordination API helping developers to build distributed applications.
	4
	5	WWW: http://pypi.python.org/pypi/tooz




# Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
# $FreeBSD$

PORTNAME=	cinder
PORTVERSION=	9.1.1
CATEGORIES=	misc python
MASTER_SITES=   https://fossies.org/linux/misc/openstack/
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

MAINTAINER=	alexander.nusov@nfvexpress.com
COMMENT=	OpenStack Storage Service (Cinder)

LICENSE=	APACHE20

BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
RUN_DEPENDS:=	${BUILD_DEPENDS}
RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel \
		${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator \
		${PYTHON_PKGNAMEPREFIX}enum34>=0:devel/py-enum34 \
		${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet \
		${PYTHON_PKGNAMEPREFIX}greenlet>=0.3.2:devel/py-greenlet \
		${PYTHON_PKGNAMEPREFIX}httplib2>=0.7.5:www/py-httplib2 \
		${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 \
		${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.7:net/py-ipaddress \
		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1 \
		${PYTHON_PKGNAMEPREFIX}keystonemiddleware>=0:devel/py-keystonemiddleware \
		${PYTHON_PKGNAMEPREFIX}lxml>=2.3:devel/py-lxml \
		${PYTHON_PKGNAMEPREFIX}oauth2client>=1.5.0:security/py-oauth2client \
		${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \
		${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \
		${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context \
		${PYTHON_PKGNAMEPREFIX}oslo.db>=0:devel/py-oslo.db \
		${PYTHON_PKGNAMEPREFIX}oslo.log>=1.14.0:devel/py-oslo.log \
		${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.2.0:devel/py-oslo.messaging \
		${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.0.0:devel/py-oslo.middleware \
		${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.reports>=0.6.0:devel/py-oslo.reports \
		${PYTHON_PKGNAMEPREFIX}oslo.rootwrap>=5.0.0:devel/py-oslo.rootwrap \
		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \
		${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service \
		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils \
		${PYTHON_PKGNAMEPREFIX}oslo.versionedobjects>=1.13.0:devel/py-oslo.versionedobjects \
		${PYTHON_PKGNAMEPREFIX}osprofiler>=1.4.0:devel/py-osprofiler \
		${PYTHON_PKGNAMEPREFIX}paramiko>=2.0:security/py-paramiko \
		${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste \
		${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy \
		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:security/py-pycrypto \
		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing \
		${PYTHON_PKGNAMEPREFIX}python-barbicanclient>=4.0.0:net/py-python-barbicanclient \
		${PYTHON_PKGNAMEPREFIX}python-glanceclient>=0:net/py-python-glanceclient \
		${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient \
		${PYTHON_PKGNAMEPREFIX}python-novaclient>=0:net/py-python-novaclient \
		${PYTHON_PKGNAMEPREFIX}python-swiftclient>=2.2.0:databases/py-python-swiftclient \
		${PYTHON_PKGNAMEPREFIX}pytz>=2013.6:devel/py-pytz \
		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
		${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying \
		${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes \
		${PYTHON_PKGNAMEPREFIX}taskflow>=1.26.0:devel/py-taskflow \
		${PYTHON_PKGNAMEPREFIX}rtslib-fb>=0:devel/py-rtslib-fb \
		${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson \
		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
		${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10 \
		${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate \
		${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore \
		${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob \
		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
		${PYTHON_PKGNAMEPREFIX}oslo.vmware>=2.11.0:devel/py-oslo.vmware \
		${PYTHON_PKGNAMEPREFIX}os-brick>=1.6.1:devel/py-os-brick \
		${PYTHON_PKGNAMEPREFIX}os-win>=0.2.3:devel/py-os-win \
		${PYTHON_PKGNAMEPREFIX}tooz>=1.28.0:devel/py-tooz \
		${PYTHON_PKGNAMEPREFIX}google-api-python-client>=1.4.1:www/py-google-api-python-client \
		${PYTHON_PKGNAMEPREFIX}castellan>=0.4.0:devel/py-castellan

EXTRA_PATCHES=  ${FILESDIR}/01-remotefs.patch:-p1 \
		${FILESDIR}/02-nfs.patch:-p1

NO_ARCH=	yes

USES=		python
USE_PYTHON=	autoplist distutils

USE_RC_SUBR=    cinder-api \
		cinder-scheduler \
		cinder-volume
USERS=		cinder
GROUPS=		cinder

post-extract:
	@(cd ${WRKSRC}/etc/cinder; ${MV} logging_sample.conf logging.conf.sample)
	@(cd ${WRKSRC}/etc/cinder; for f in *.conf; do ${MV} $${f} $${f}.sample; done)

post-patch:
	${CP} ${FILESDIR}/cinder.conf.sample \
		${WRKSRC}/etc/cinder/cinder.conf.sample

post-install:
	${MKDIR} ${STAGEDIR}${ETCDIR}
	${CP} -R ${WRKSRC}/etc/cinder/ ${STAGEDIR}${ETCDIR}

.include <bsd.port.mk>

Line 0 Link Here

(-)misc/py-cinder/distinfo (+3 lines)
	1	TIMESTAMP = 1483236622
	2	SHA256 (cinder-9.1.1.tar.gz) = 455831c90ac6eafde83bb7b57d0c8ee0caf19a419bf760b2451aa7164cc9627d
	3	SIZE (cinder-9.1.1.tar.gz) = 4201222




From 6c320b98634aa4d3d7b1e9f58b6ca19073cd0b32 Mon Sep 17 00:00:00 2001
From: Alexander Nusov <alexander.nusov@nfvexpress.com>
Date: Mon, 12 Dec 2016 13:49:04 +0300
Subject: [PATCH] fix remotefs

---
 cinder/volume/drivers/remotefs.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/cinder/volume/drivers/remotefs.py b/cinder/volume/drivers/remotefs.py
index 0160b0a..d263bf3 100644
--- a/cinder/volume/drivers/remotefs.py
+++ b/cinder/volume/drivers/remotefs.py
@@ -208,9 +208,9 @@ class RemoteFSDriver(driver.LocalVD, driver.TransferVD, driver.BaseVD):
         provisioned_size = 0.0
         for share in self.shares.keys():
             mount_path = self._get_mount_point_for_share(share)
-            out, _ = self._execute('du', '--bytes', mount_path,
+            out, _ = self._execute('du', '-k', mount_path,
                                    run_as_root=True)
-            provisioned_size += int(out.split()[0])
+            provisioned_size += int(out.split()[0]) * 1024
         return round(provisioned_size / units.Gi, 2)
 
     def _get_mount_point_base(self):
@@ -824,13 +824,12 @@ class RemoteFSSnapDriverBase(RemoteFSDriver, driver.SnapshotVD):
         """
         mount_point = self._get_mount_point_for_share(share)
 
-        out, _ = self._execute('df', '--portability', '--block-size', '1',
-                               mount_point,
+        out, _ = self._execute('df', '-k', mount_point,
                                run_as_root=self._execute_as_root)
         out = out.splitlines()[1]
 
-        size = int(out.split()[1])
-        available = int(out.split()[3])
+        size = int(out.split()[1]) * 1024
+        available = int(out.split()[3]) * 1024
 
         return available, size
 
-- 
2.8.1





diff --git a/cinder/volume/drivers/nfs.py b/cinder/volume/drivers/nfs.py
index d495b4a..0fb33c6 100644
--- a/cinder/volume/drivers/nfs.py
+++ b/cinder/volume/drivers/nfs.py
@@ -139,10 +139,10 @@ class NfsDriver(driver.ExtendVD, remotefs.RemoteFSDriver):
 
         self.shares = {}  # address : options
 
-        # Check if mount.nfs is installed on this system; note that we
+        # Check if mount_nfs is installed on this system; note that we
         # need to be root, to also find mount.nfs on distributions, where
         # it is not located in an unprivileged users PATH (e.g. /sbin).
-        package = 'mount.nfs'
+        package = 'mount_nfs'
         try:
             self._execute(package, check_exit_code=False,
                           run_as_root=True)
@@ -299,16 +299,16 @@ class NfsDriver(driver.ExtendVD, remotefs.RemoteFSDriver):
 
         mount_point = self._get_mount_point_for_share(nfs_share)
 
-        df, _ = self._execute('stat', '-f', '-c', '%S %b %a', mount_point,
+        df, _ = self._execute('df', '-k', mount_point,
                               run_as_root=run_as_root)
-        block_size, blocks_total, blocks_avail = map(float, df.split())
-        total_available = block_size * blocks_avail
-        total_size = block_size * blocks_total
+        df = df.splitlines()[1]
+        block_size = 1024
+        total_available = block_size * int(df.split()[3])
+        total_size = block_size * int(df.split()[1])
 
-        du, _ = self._execute('du', '-sb', '--apparent-size', '--exclude',
-                              '*snapshot*', mount_point,
+        du, _ = self._execute('du', '-Aks', mount_point,
                               run_as_root=run_as_root)
-        total_allocated = float(du.split()[0])
+        total_allocated = float(du.split()[0]) * 1024
         return total_size, total_available, total_allocated
 
     def _get_mount_point_base(self):




#!/bin/sh
#
# $FreeBSD$
#

# PROVIDE: cinder_api
# REQUIRE: LOGIN
# KEYWORD: shutdown

#
# Add the following lines to /etc/rc.conf to enable cinder_api:
#
# cinder_api_enable="YES"
#
# cinder_api_enable (bool):
#	Set it to "YES" to enable cinder_api.
# 	Default is "NO".
#
# cinder_api_logdir (str):
#	Set it to chagge log directory
#	Default is "/var/log/cinder"
#
# cinder_api_args (str):
#	Set it to change command line arguments.
#	Default is "--log-file ${cinder_api_logdir}/cinder-api.log"
#

. /etc/rc.subr

name=cinder_api
rcvar=cinder_api_enable

PATH=%%PREFIX%%/bin:%%PREFIX%%/sbin:$PATH

pidfile="/var/run/cinder-api.pid"
procname="%%PREFIX%%/bin/python2.7"

start_precmd=cinder_precmd

load_rc_config $name

: ${cinder_api_enable:="NO"}
: ${cinder_api_logdir:="/var/log/cinder"}
: ${cinder_api_args:="--log-file ${cinder_api_logdir}/cinder-api.log"}

command="/usr/sbin/daemon"
command_args="-f -p ${pidfile} cinder-api ${cinder_api_args}"

cinder_precmd() {
	mkdir -p ${cinder_api_logdir}
}

run_rc_command "$1"




#!/bin/sh
#
# $FreeBSD$
#

# PROVIDE: cinder_scheduler
# REQUIRE: LOGIN
# KEYWORD: shutdown

#
# Add the following lines to /etc/rc.conf to enable cinder_scheduler:
#
# cinder_scheduler_enable="YES"
#
# cinder_scheduler_enable (bool):
#	Set it to "YES" to enable cinder_scheduler.
# 	Default is "NO".
#
# cinder_scheduler_logdir (str):
#	Set it to chagge log directory
#	Default is "/var/log/cinder"
#
# cinder_scheduler_args (str):
#	Set it to change command line arguments.
#	Default is "--log-file ${cinder_scheduler_logdir}/cinder-scheduler.log"
#

. /etc/rc.subr

name=cinder_scheduler
rcvar=cinder_scheduler_enable

PATH=%%PREFIX%%/bin:%%PREFIX%%/sbin:$PATH

pidfile="/var/run/cinder-scheduler.pid"
procname="%%PREFIX%%/bin/python2.7"

start_precmd=cinder_precmd

load_rc_config $name

: ${cinder_scheduler_enable:="NO"}
: ${cinder_scheduler_logdir:="/var/log/cinder"}
: ${cinder_scheduler_args:="--log-file ${cinder_scheduler_logdir}/cinder-scheduler.log"}

command="/usr/sbin/daemon"
command_args="-f -p ${pidfile} cinder-scheduler ${cinder_scheduler_args}"

cinder_precmd() {
	mkdir -p ${cinder_scheduler_logdir}
}

run_rc_command "$1"




#!/bin/sh
#
# $FreeBSD$
#

# PROVIDE: cinder_volume
# REQUIRE: LOGIN
# KEYWORD: shutdown

#
# Add the following lines to /etc/rc.conf to enable cinder_volume:
#
# cinder_volume_enable="YES"
#
# cinder_volume_enable (bool):
#	Set it to "YES" to enable cinder_volume.
# 	Default is "NO".
#
# cinder_volume_logdir (str):
#	Set it to chagge log directory
#	Default is "/var/log/cinder"
#
# cinder_volume_args (str):
#	Set it to change command line arguments.
#	Default is "--log-file ${cinder_volume_logdir}/cinder-volume.log"
#

. /etc/rc.subr

name=cinder_volume
rcvar=cinder_volume_enable

PATH=%%PREFIX%%/bin:%%PREFIX%%/sbin:$PATH

pidfile="/var/run/cinder-volume.pid"
procname="%%PREFIX%%/bin/python2.7"

start_precmd=cinder_precmd

load_rc_config $name

: ${cinder_volume_enable:="NO"}
: ${cinder_volume_logdir:="/var/log/cinder"}
: ${cinder_volume_args:="--log-file ${cinder_volume_logdir}/cinder-volume.log"}

command="/usr/sbin/daemon"
command_args="-f -p ${pidfile} cinder-volume ${cinder_volume_args}"

cinder_precmd() {
	mkdir -p ${cinder_volume_logdir}
}

run_rc_command "$1"




[DEFAULT]
rootwrap_config = /usr/local/etc/cinder/rootwrap.conf
api_paste_confg = /usr/local/etc/cinder/api-paste.ini
iscsi_helper = tgtadm
volume_name_template = volume-%s
volume_group = cinder-volumes
verbose = True
auth_strategy = keystone
state_path = /var/lib/cinder
lock_path = /var/lock/cinder
volumes_dir = /var/lib/cinder/volumes
transport_url = rabbit://openstack:RABBIT_PASS@controller
my_ip = 192.168.1.30
nfs_shares_config = /usr/local/etc/cinder/nfsshares
volume_driver = cinder.volume.drivers.nfs.NfsDriver

[database]
connection = mysql+pymysql://cinder:CINDER_DBPASS@controller/cinder

[keystone_authtoken]
auth_uri = http://controller:5000
auth_url = http://controller:35357
memcached_servers = controller:11211
auth_type = password
project_domain_name = default
user_domain_name = default
project_name = service
username = cinder
password = cinder

[oslo_concurrency]
lock_path = /var/lib/cinder/tmp

Line 0 Link Here

(-)misc/py-cinder/pkg-descr (+10 lines)
	1	Cinder is a Block Storage service for OpenStack. It's designed to present
	2	storage resources to end users that can be consumed by the OpenStack Compute
	3	Project (Nova). This is done through the use of either a reference
	4	implementation (LVM) or plugin drivers for other storage. The short
	5	description of Cinder is that it virtualizes the management of block storage
	6	devices and provides end users with a self service API to request and consume
	7	those resources without requiring any knowledge of where their storage is
	8	actually deployed or on what type of device.
	9
	10	WWW: http://openstack.org/cinder

Line 0 Link Here

(-)misc/py-cinder/pkg-message (+5 lines)
	1	Please note that this is a development version.
	2	Only initial NFS support was added.
	3
	4	Enable NFS client in rc.conf
	5	# sysrc nfs_client_enable="YES"

Line 0 Link Here

(-)misc/py-cinder/pkg-plist (+11 lines)
	1	@owner cinder
	2	@dir %%ETCDIR%%
	3	@sample %%ETCDIR%%/api-httpd.conf.sample
	4	@sample %%ETCDIR%%/logging.conf.sample
	5	@sample %%ETCDIR%%/cinder.conf.sample
	6	%%ETCDIR%%/api-paste.ini
	7	%%ETCDIR%%/policy.json
	8	@owner root
	9	@sample %%ETCDIR%%/rootwrap.conf.sample
	10	@dir etc/cinder/rootwrap.d
	11	%%ETCDIR%%/rootwrap.d/volume.filters

Return to bug 215850

Lines 149-155 Link Here

(-)UIDs (-3 / +3 lines)
149	sympa:*:200:200::0:0:Sympa Owner:/nonexistent:/usr/sbin/nologin	149	sympa:*:200:200::0:0:Sympa Owner:/nonexistent:/usr/sbin/nologin
150	privoxy:*:201:201::0:0:Privoxy proxy user:/nonexistent:/usr/sbin/nologin	150	privoxy:*:201:201::0:0:Privoxy proxy user:/nonexistent:/usr/sbin/nologin
151	dspam:*:202:202::0:0:Dspam:/nonexistent:/usr/sbin/nologin	151	dspam:*:202:202::0:0:Dspam:/nonexistent:/usr/sbin/nologin
152	# free: 203	152	cinder:*:203:203::0:0:Cinder daemon pseudo-user:/var/lib/cinder:/usr/sbin/nologin
153	yate:*:204:204::0:0:Yate:/nonexistent:/usr/sbin/nologin	153	yate:*:204:204::0:0:Yate:/nonexistent:/usr/sbin/nologin
154	gnugk:*:205:205::0:0:GNU GateKeeper pseudo-user:/nonexistent:/usr/sbin/nologin	154	gnugk:*:205:205::0:0:GNU GateKeeper pseudo-user:/nonexistent:/usr/sbin/nologin
155	gini:*:206:206::0:0:& streaming server:/var/log/gini:/usr/sbin/nologin	155	gini:*:206:206::0:0:& streaming server:/var/log/gini:/usr/sbin/nologin
Lines 366-372 Link Here
366	# free: 417	366	# free: 417
367	# free: 418	367	# free: 418
368	# free: 419	368	# free: 419
369	oxidized:*:420:420::0:0:Oxidized Owner:/var/db/oxidized:/usr/sbin/nologin	369	# free: 420
370	# free: 421	370	# free: 421
371	# free: 422	371	# free: 422
372	# free: 423	372	# free: 423
Lines 896-902 Link Here
896	mapred:*:947:955::0:0:Hadoop MapReduce user:/nonexistent:/usr/sbin/nologin	896	mapred:*:947:955::0:0:Hadoop MapReduce user:/nonexistent:/usr/sbin/nologin
897	dnrd:*:948:948::0:0:& user:/nonexistent:/usr/sbin/nologin	897	dnrd:*:948:948::0:0:& user:/nonexistent:/usr/sbin/nologin
898	_lldpd:*:949:949::0:0:lldpd user:/nonexistent:/usr/sbin/nologin	898	_lldpd:*:949:949::0:0:lldpd user:/nonexistent:/usr/sbin/nologin
899	couchpotato:*:950:65534::0:0:couchpotato user:/nonexistent:/usr/sbin/nologin	899	# free: 950
900	openerpd:*:951:951::0:0:Openerpd user:/nonexistent:/usr/sbin/nologin	900	openerpd:*:951:951::0:0:Openerpd user:/nonexistent:/usr/sbin/nologin
901	bitten-slave:*:952:952:daemon:0:0:Bitten slave user:/var/lib/bitten-slave:/usr/sbin/nologin	901	bitten-slave:*:952:952:daemon:0:0:Bitten slave user:/var/lib/bitten-slave:/usr/sbin/nologin
902	_neubot:*:953:953::0:0:neubot daemon:/nonexistent:/usr/sbin/nologin	902	_neubot:*:953:953::0:0:neubot daemon:/nonexistent:/usr/sbin/nologin

Line 0 Link Here

(-)devel/py-oslo.vmware/Makefile (+34 lines)
	1	# Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
	2	# $FreeBSD$
	3
	4	PORTNAME= oslo.vmware
	5	PORTVERSION= 2.16.0
	6	CATEGORIES= devel python
	7	MASTER_SITES= CHEESESHOP
	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
	9
	10	MAINTAINER= alexander.nusov@nfvexpress.com
	11	COMMENT= Oslo VMware library
	12
	13	LICENSE= APACHE20
	14
	15	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
	16	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>=1.15.1:net/py-urllib3 \
	17	${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \
	18	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
	19	${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
	20	${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \
	21	${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
	22	${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \
	23	${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr \
	24	${PYTHON_PKGNAMEPREFIX}lxml>=2.3:devel/py-lxml \
	25	${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet \
	26	${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml \
	27	${PYTHON_PKGNAMEPREFIX}suds-jurko>=0.6:devel/py-suds-jurko
	28
	29	NO_ARCH= yes
	30
	31	USES= python
	32	USE_PYTHON= autoplist distutils
	33
	34	.include <bsd.port.mk>

Line 0 Link Here

(-)devel/py-rtslib-fb/Makefile (+20 lines)
	1	# Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
	2	# $FreeBSD$
	3
	4	PORTNAME= rtslib-fb
	5	PORTVERSION= 2.1.47
	6	CATEGORIES= devel python
	7	MASTER_SITES= CHEESESHOP
	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
	9
	10	MAINTAINER= alexander.nusov@nfvexpress.com
	11	COMMENT= API for Linux kernel SCSI target (aka lio)
	12
	13	LICENSE= APACHE20
	14
	15	NO_ARCH= yes
	16
	17	USES= python
	18	USE_PYTHON= autoplist distutils
	19
	20	.include <bsd.port.mk>

Line 0 Link Here

(-)devel/py-suds-jurko/Makefile (+18 lines)
	1	# Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
	2	# $FreeBSD$
	3
	4	PORTNAME= suds-jurko
	5	PORTVERSION= 0.6
	6	CATEGORIES= devel python
	7	MASTER_SITES= CHEESESHOP
	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
	9
	10	MAINTAINER= alexander.nusov@nfvexpress.com
	11	COMMENT= Lightweight SOAP client (jurko's fork)
	12
	13	NO_ARCH= yes
	14
	15	USES= python tar:bz2
	16	USE_PYTHON= autoplist distutils
	17
	18	.include <bsd.port.mk>

Line 0 Link Here

(-)devel/py-tenacity/Makefile (+23 lines)
	1	# Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
	2	# $FreeBSD$
	3
	4	PORTNAME= tenacity
	5	PORTVERSION= 3.4.0
	6	CATEGORIES= devel python
	7	MASTER_SITES= CHEESESHOP
	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
	9
	10	MAINTAINER= alexander.nusov@nfvexpress.com
	11	COMMENT= Task retrying for python library
	12
	13	LICENSE= APACHE20
	14
	15	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
	16	RUN_DEPENDS:= ${BUILD_DEPENDS}
	17
	18	NO_ARCH= yes
	19
	20	USES= python
	21	USE_PYTHON= autoplist distutils
	22
	23	.include <bsd.port.mk>

Line 0 Link Here

(-)devel/py-tooz/Makefile (+33 lines)
	1	# Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
	2	# $FreeBSD$
	3
	4	PORTNAME= tooz
	5	PORTVERSION= 1.46.0
	6	CATEGORIES= devel python
	7	MASTER_SITES= CHEESESHOP
	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
	9
	10	MAINTAINER= alexander.nusov@nfvexpress.com
	11	COMMENT= Coordination library for distributed systems
	12
	13	LICENSE= APACHE20
	14
	15	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
	16	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}futures>=3.0:devel/py-futures \
	17	${PYTHON_PKGNAMEPREFIX}enum34>=0:devel/py-enum34 \
	18	${PYTHON_PKGNAMEPREFIX}voluptuous>=0.8.9:devel/py-voluptuous \
	19	${PYTHON_PKGNAMEPREFIX}tenacity>=3.2.1:devel/py-tenacity \
	20	${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore \
	21	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
	22	${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.15.0:devel/py-oslo.utils \
	23	${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \
	24	${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.4.0:devel/py-msgpack-python \
	25	${PYTHON_PKGNAMEPREFIX}futurist>=0:devel/py-futurist \
	26	${PYTHON_PKGNAMEPREFIX}fasteners>=0.7:devel/py-fasteners
	27
	28	NO_ARCH= yes
	29
	30	USES= python
	31	USE_PYTHON= autoplist distutils
	32
	33	.include <bsd.port.mk>

Line 0 Link Here

(-)misc/py-cinder/Makefile (+101 lines)
		1	# Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
		2	# $FreeBSD$
		3
		4	PORTNAME= cinder
		5	PORTVERSION= 9.1.1
		6	CATEGORIES= misc python
		7	MASTER_SITES= https://fossies.org/linux/misc/openstack/
		8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
		9
		10	MAINTAINER= alexander.nusov@nfvexpress.com
		11	COMMENT= OpenStack Storage Service (Cinder)
		12
		13	LICENSE= APACHE20
		14
		15	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
		16	RUN_DEPENDS:= ${BUILD_DEPENDS}
		17	RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel \
		18	${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator \
		19	${PYTHON_PKGNAMEPREFIX}enum34>=0:devel/py-enum34 \
		20	${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet \
		21	${PYTHON_PKGNAMEPREFIX}greenlet>=0.3.2:devel/py-greenlet \
		22	${PYTHON_PKGNAMEPREFIX}httplib2>=0.7.5:www/py-httplib2 \
		23	${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 \
		24	${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.7:net/py-ipaddress \
		25	${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1 \
		26	${PYTHON_PKGNAMEPREFIX}keystonemiddleware>=0:devel/py-keystonemiddleware \
		27	${PYTHON_PKGNAMEPREFIX}lxml>=2.3:devel/py-lxml \
		28	${PYTHON_PKGNAMEPREFIX}oauth2client>=1.5.0:security/py-oauth2client \
		29	${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \
		30	${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \
		31	${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context \
		32	${PYTHON_PKGNAMEPREFIX}oslo.db>=0:devel/py-oslo.db \
		33	${PYTHON_PKGNAMEPREFIX}oslo.log>=1.14.0:devel/py-oslo.log \
		34	${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.2.0:devel/py-oslo.messaging \
		35	${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.0.0:devel/py-oslo.middleware \
		36	${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.9.0:devel/py-oslo.policy \
		37	${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.9.0:devel/py-oslo.privsep \
		38	${PYTHON_PKGNAMEPREFIX}oslo.reports>=0.6.0:devel/py-oslo.reports \
		39	${PYTHON_PKGNAMEPREFIX}oslo.rootwrap>=5.0.0:devel/py-oslo.rootwrap \
		40	${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \
		41	${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service \
		42	${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils \
		43	${PYTHON_PKGNAMEPREFIX}oslo.versionedobjects>=1.13.0:devel/py-oslo.versionedobjects \
		44	${PYTHON_PKGNAMEPREFIX}osprofiler>=1.4.0:devel/py-osprofiler \
		45	${PYTHON_PKGNAMEPREFIX}paramiko>=2.0:security/py-paramiko \
		46	${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste \
		47	${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy \
		48	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:security/py-pycrypto \
		49	${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing \
		50	${PYTHON_PKGNAMEPREFIX}python-barbicanclient>=4.0.0:net/py-python-barbicanclient \
		51	${PYTHON_PKGNAMEPREFIX}python-glanceclient>=0:net/py-python-glanceclient \
		52	${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient \
		53	${PYTHON_PKGNAMEPREFIX}python-novaclient>=0:net/py-python-novaclient \
		54	${PYTHON_PKGNAMEPREFIX}python-swiftclient>=2.2.0:databases/py-python-swiftclient \
		55	${PYTHON_PKGNAMEPREFIX}pytz>=2013.6:devel/py-pytz \
		56	${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
		57	${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying \
		58	${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes \
		59	${PYTHON_PKGNAMEPREFIX}taskflow>=1.26.0:devel/py-taskflow \
		60	${PYTHON_PKGNAMEPREFIX}rtslib-fb>=0:devel/py-rtslib-fb \
		61	${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson \
		62	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
		63	${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10 \
		64	${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate \
65	${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore \
66	${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob \
67	${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
68	${PYTHON_PKGNAMEPREFIX}oslo.vmware>=2.11.0:devel/py-oslo.vmware \
69	${PYTHON_PKGNAMEPREFIX}os-brick>=1.6.1:devel/py-os-brick \
70	${PYTHON_PKGNAMEPREFIX}os-win>=0.2.3:devel/py-os-win \
71	${PYTHON_PKGNAMEPREFIX}tooz>=1.28.0:devel/py-tooz \
72	${PYTHON_PKGNAMEPREFIX}google-api-python-client>=1.4.1:www/py-google-api-python-client \
73	${PYTHON_PKGNAMEPREFIX}castellan>=0.4.0:devel/py-castellan
74
75	EXTRA_PATCHES= ${FILESDIR}/01-remotefs.patch:-p1 \
76	${FILESDIR}/02-nfs.patch:-p1
77
78	NO_ARCH= yes
79
80	USES= python
81	USE_PYTHON= autoplist distutils
82
83	USE_RC_SUBR= cinder-api \
84	cinder-scheduler \
85	cinder-volume
86	USERS= cinder
87	GROUPS= cinder
88
89	post-extract:
90	@(cd ${WRKSRC}/etc/cinder; ${MV} logging_sample.conf logging.conf.sample)
91	@(cd ${WRKSRC}/etc/cinder; for f in *.conf; do ${MV} $${f} $${f}.sample; done)
92
93	post-patch:
94	${CP} ${FILESDIR}/cinder.conf.sample \
95	${WRKSRC}/etc/cinder/cinder.conf.sample
96
97	post-install:
98	${MKDIR} ${STAGEDIR}${ETCDIR}
99	${CP} -R ${WRKSRC}/etc/cinder/ ${STAGEDIR}${ETCDIR}
100
101	.include <bsd.port.mk>

Line 0 Link Here

(-)misc/py-cinder/files/01-remotefs.patch (+45 lines)
	1	From 6c320b98634aa4d3d7b1e9f58b6ca19073cd0b32 Mon Sep 17 00:00:00 2001
	2	From: Alexander Nusov <alexander.nusov@nfvexpress.com>
	3	Date: Mon, 12 Dec 2016 13:49:04 +0300
	4	Subject: [PATCH] fix remotefs
	5
	6	---
	7	cinder/volume/drivers/remotefs.py \| 11 +++++------
	8	1 file changed, 5 insertions(+), 6 deletions(-)
	9
	10	diff --git a/cinder/volume/drivers/remotefs.py b/cinder/volume/drivers/remotefs.py
	11	index 0160b0a..d263bf3 100644
	12	--- a/cinder/volume/drivers/remotefs.py
	13	+++ b/cinder/volume/drivers/remotefs.py
	14	@@ -208,9 +208,9 @@ class RemoteFSDriver(driver.LocalVD, driver.TransferVD, driver.BaseVD):
	15	provisioned_size = 0.0
	16	for share in self.shares.keys():
	17	mount_path = self._get_mount_point_for_share(share)
	18	- out, _ = self._execute('du', '--bytes', mount_path,
	19	+ out, _ = self._execute('du', '-k', mount_path,
	20	run_as_root=True)
	21	- provisioned_size += int(out.split()[0])
	22	+ provisioned_size += int(out.split()[0]) * 1024
	23	return round(provisioned_size / units.Gi, 2)
	24
	25	def _get_mount_point_base(self):
	26	@@ -824,13 +824,12 @@ class RemoteFSSnapDriverBase(RemoteFSDriver, driver.SnapshotVD):
	27	"""
	28	mount_point = self._get_mount_point_for_share(share)
	29
	30	- out, _ = self._execute('df', '--portability', '--block-size', '1',
	31	- mount_point,
	32	+ out, _ = self._execute('df', '-k', mount_point,
	33	run_as_root=self._execute_as_root)
	34	out = out.splitlines()[1]
	35
	36	- size = int(out.split()[1])
	37	- available = int(out.split()[3])
	38	+ size = int(out.split()[1]) * 1024
	39	+ available = int(out.split()[3]) * 1024
	40
	41	return available, size
	42
	43	--
	44	2.8.1
	45

Line 0 Link Here

(-)misc/py-cinder/files/02-nfs.patch (+41 lines)
	1	diff --git a/cinder/volume/drivers/nfs.py b/cinder/volume/drivers/nfs.py
	2	index d495b4a..0fb33c6 100644
	3	--- a/cinder/volume/drivers/nfs.py
	4	+++ b/cinder/volume/drivers/nfs.py
	5	@@ -139,10 +139,10 @@ class NfsDriver(driver.ExtendVD, remotefs.RemoteFSDriver):
	6
	7	self.shares = {} # address : options
	8
	9	- # Check if mount.nfs is installed on this system; note that we
	10	+ # Check if mount_nfs is installed on this system; note that we
	11	# need to be root, to also find mount.nfs on distributions, where
	12	# it is not located in an unprivileged users PATH (e.g. /sbin).
	13	- package = 'mount.nfs'
	14	+ package = 'mount_nfs'
	15	try:
	16	self._execute(package, check_exit_code=False,
	17	run_as_root=True)
	18	@@ -299,16 +299,16 @@ class NfsDriver(driver.ExtendVD, remotefs.RemoteFSDriver):
	19
	20	mount_point = self._get_mount_point_for_share(nfs_share)
	21
	22	- df, _ = self._execute('stat', '-f', '-c', '%S %b %a', mount_point,
	23	+ df, _ = self._execute('df', '-k', mount_point,
	24	run_as_root=run_as_root)
	25	- block_size, blocks_total, blocks_avail = map(float, df.split())
	26	- total_available = block_size * blocks_avail
	27	- total_size = block_size * blocks_total
	28	+ df = df.splitlines()[1]
	29	+ block_size = 1024
	30	+ total_available = block_size * int(df.split()[3])
	31	+ total_size = block_size * int(df.split()[1])
	32
	33	- du, _ = self._execute('du', '-sb', '--apparent-size', '--exclude',
	34	- 'snapshot', mount_point,
	35	+ du, _ = self._execute('du', '-Aks', mount_point,
	36	run_as_root=run_as_root)
	37	- total_allocated = float(du.split()[0])
	38	+ total_allocated = float(du.split()[0]) * 1024
	39	return total_size, total_available, total_allocated
	40
	41	def _get_mount_point_base(self):

Line 0 Link Here

(-)misc/py-cinder/files/cinder-api.in (+53 lines)
	1	#!/bin/sh
	2	#
	3	# $FreeBSD$
	4	#
	5
	6	# PROVIDE: cinder_api
	7	# REQUIRE: LOGIN
	8	# KEYWORD: shutdown
	9
	10	#
	11	# Add the following lines to /etc/rc.conf to enable cinder_api:
	12	#
	13	# cinder_api_enable="YES"
	14	#
	15	# cinder_api_enable (bool):
	16	# Set it to "YES" to enable cinder_api.
	17	# Default is "NO".
	18	#
	19	# cinder_api_logdir (str):
	20	# Set it to chagge log directory
	21	# Default is "/var/log/cinder"
	22	#
	23	# cinder_api_args (str):
	24	# Set it to change command line arguments.
	25	# Default is "--log-file ${cinder_api_logdir}/cinder-api.log"
	26	#
	27
	28	. /etc/rc.subr
	29
	30	name=cinder_api
	31	rcvar=cinder_api_enable
	32
	33	PATH=%%PREFIX%%/bin:%%PREFIX%%/sbin:$PATH
	34
	35	pidfile="/var/run/cinder-api.pid"
	36	procname="%%PREFIX%%/bin/python2.7"
	37
	38	start_precmd=cinder_precmd
	39
	40	load_rc_config $name
	41
	42	: ${cinder_api_enable:="NO"}
	43	: ${cinder_api_logdir:="/var/log/cinder"}
	44	: ${cinder_api_args:="--log-file ${cinder_api_logdir}/cinder-api.log"}
	45
	46	command="/usr/sbin/daemon"
	47	command_args="-f -p ${pidfile} cinder-api ${cinder_api_args}"
	48
	49	cinder_precmd() {
	50	mkdir -p ${cinder_api_logdir}
	51	}
	52
	53	run_rc_command "$1"

Line 0 Link Here

(-)misc/py-cinder/files/cinder-scheduler.in (+53 lines)
	1	#!/bin/sh
	2	#
	3	# $FreeBSD$
	4	#
	5
	6	# PROVIDE: cinder_scheduler
	7	# REQUIRE: LOGIN
	8	# KEYWORD: shutdown
	9
	10	#
	11	# Add the following lines to /etc/rc.conf to enable cinder_scheduler:
	12	#
	13	# cinder_scheduler_enable="YES"
	14	#
	15	# cinder_scheduler_enable (bool):
	16	# Set it to "YES" to enable cinder_scheduler.
	17	# Default is "NO".
	18	#
	19	# cinder_scheduler_logdir (str):
	20	# Set it to chagge log directory
	21	# Default is "/var/log/cinder"
	22	#
	23	# cinder_scheduler_args (str):
	24	# Set it to change command line arguments.
	25	# Default is "--log-file ${cinder_scheduler_logdir}/cinder-scheduler.log"
	26	#
	27
	28	. /etc/rc.subr
	29
	30	name=cinder_scheduler
	31	rcvar=cinder_scheduler_enable
	32
	33	PATH=%%PREFIX%%/bin:%%PREFIX%%/sbin:$PATH
	34
	35	pidfile="/var/run/cinder-scheduler.pid"
	36	procname="%%PREFIX%%/bin/python2.7"
	37
	38	start_precmd=cinder_precmd
	39
	40	load_rc_config $name
	41
	42	: ${cinder_scheduler_enable:="NO"}
	43	: ${cinder_scheduler_logdir:="/var/log/cinder"}
	44	: ${cinder_scheduler_args:="--log-file ${cinder_scheduler_logdir}/cinder-scheduler.log"}
	45
	46	command="/usr/sbin/daemon"
	47	command_args="-f -p ${pidfile} cinder-scheduler ${cinder_scheduler_args}"
	48
	49	cinder_precmd() {
	50	mkdir -p ${cinder_scheduler_logdir}
	51	}
	52
	53	run_rc_command "$1"

Line 0 Link Here

(-)misc/py-cinder/files/cinder-volume.in (+53 lines)
	1	#!/bin/sh
	2	#
	3	# $FreeBSD$
	4	#
	5
	6	# PROVIDE: cinder_volume
	7	# REQUIRE: LOGIN
	8	# KEYWORD: shutdown
	9
	10	#
	11	# Add the following lines to /etc/rc.conf to enable cinder_volume:
	12	#
	13	# cinder_volume_enable="YES"
	14	#
	15	# cinder_volume_enable (bool):
	16	# Set it to "YES" to enable cinder_volume.
	17	# Default is "NO".
	18	#
	19	# cinder_volume_logdir (str):
	20	# Set it to chagge log directory
	21	# Default is "/var/log/cinder"
	22	#
	23	# cinder_volume_args (str):
	24	# Set it to change command line arguments.
	25	# Default is "--log-file ${cinder_volume_logdir}/cinder-volume.log"
	26	#
	27
	28	. /etc/rc.subr
	29
	30	name=cinder_volume
	31	rcvar=cinder_volume_enable
	32
	33	PATH=%%PREFIX%%/bin:%%PREFIX%%/sbin:$PATH
	34
	35	pidfile="/var/run/cinder-volume.pid"
	36	procname="%%PREFIX%%/bin/python2.7"
	37
	38	start_precmd=cinder_precmd
	39
	40	load_rc_config $name
	41
	42	: ${cinder_volume_enable:="NO"}
	43	: ${cinder_volume_logdir:="/var/log/cinder"}
	44	: ${cinder_volume_args:="--log-file ${cinder_volume_logdir}/cinder-volume.log"}
	45
	46	command="/usr/sbin/daemon"
	47	command_args="-f -p ${pidfile} cinder-volume ${cinder_volume_args}"
	48
	49	cinder_precmd() {
	50	mkdir -p ${cinder_volume_logdir}
	51	}
	52
	53	run_rc_command "$1"

Line 0 Link Here

(-)misc/py-cinder/files/cinder.conf.sample (+32 lines)
	1	[DEFAULT]
	2	rootwrap_config = /usr/local/etc/cinder/rootwrap.conf
	3	api_paste_confg = /usr/local/etc/cinder/api-paste.ini
	4	iscsi_helper = tgtadm
	5	volume_name_template = volume-%s
	6	volume_group = cinder-volumes
	7	verbose = True
	8	auth_strategy = keystone
	9	state_path = /var/lib/cinder
	10	lock_path = /var/lock/cinder
	11	volumes_dir = /var/lib/cinder/volumes
	12	transport_url = rabbit://openstack:RABBIT_PASS@controller
	13	my_ip = 192.168.1.30
	14	nfs_shares_config = /usr/local/etc/cinder/nfsshares
	15	volume_driver = cinder.volume.drivers.nfs.NfsDriver
	16
	17	[database]
	18	connection = mysql+pymysql://cinder:CINDER_DBPASS@controller/cinder
	19
	20	[keystone_authtoken]
	21	auth_uri = http://controller:5000
	22	auth_url = http://controller:35357
	23	memcached_servers = controller:11211
	24	auth_type = password
	25	project_domain_name = default
	26	user_domain_name = default
	27	project_name = service
	28	username = cinder
	29	password = cinder
	30
	31	[oslo_concurrency]
	32	lock_path = /var/lib/cinder/tmp