View | Details | Raw Unified | Return to bug 230136 | Differences between
and this patch

Collapse All | Expand All

(-)py-os-brick/Makefile (-24 / +33 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	os-brick
4
PORTNAME=	os-brick
5
PORTVERSION=	1.10.0
5
PORTVERSION=	2.3.4
6
CATEGORIES=	devel python
6
CATEGORIES=	devel python
7
MASTER_SITES=	CHEESESHOP
7
MASTER_SITES=	CHEESESHOP
8
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
8
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
Lines 11-44 Link Here
11
COMMENT=	Openstack cinder brick library for managing local volume attaches
11
COMMENT=	Openstack cinder brick library for managing local volume attaches
12
12
13
LICENSE=	APACHE20
13
LICENSE=	APACHE20
14
LICENSE_FILE=	${WRKSRC}/LICENSE
14
15
15
BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${PY_FLAVOR}
16
BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
16
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}os-win>=1.3.0:devel/py-os-win@${PY_FLAVOR} \
17
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
17
		${PYTHON_PKGNAMEPREFIX}castellan>=0.4.0:devel/py-castellan@${PY_FLAVOR} \
18
		${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \
18
		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
19
		${PYTHON_PKGNAMEPREFIX}eventlet>=0.18.2:net/py-eventlet@${PY_FLAVOR} \
19
		${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying@${PY_FLAVOR} \
20
		${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.25.0:devel/py-oslo.concurrency@${PY_FLAVOR} \
20
		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${PY_FLAVOR} \
21
		${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${PY_FLAVOR} \
21
		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${PY_FLAVOR} \
22
		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
22
		${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service@${PY_FLAVOR} \
23
		${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.23.0:devel/py-oslo.privsep@${PY_FLAVOR} \
23
		${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.9.0:devel/py-oslo.privsep@${PY_FLAVOR} \
24
		${PYTHON_PKGNAMEPREFIX}oslo.service>=1.24.0:devel/py-oslo.service@${PY_FLAVOR} \
24
		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \
25
		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \
25
		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${PY_FLAVOR} \
26
		${PYTHON_PKGNAMEPREFIX}os-win>=3.0.0:devel/py-os-win@${PY_FLAVOR} \
26
		${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${PY_FLAVOR} \
27
		${PYTHON_PKGNAMEPREFIX}requests>=2.14.2:www/py-requests@${PY_FLAVOR} \
27
		${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${PY_FLAVOR} \
28
		${PYTHON_PKGNAMEPREFIX}retrying>=1.2.3:devel/py-retrying@${PY_FLAVOR} \
28
		${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${PY_FLAVOR} \
29
		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
29
		${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR}
30
30
31
USES=		python
32
USE_PYTHON=	autoplist distutils
33
31
NO_ARCH=	yes
34
NO_ARCH=	yes
32
35
33
EXTRA_PATCHES=	${FILESDIR}/01-os-type.patch:-p1 \
36
MY_REGEX=	(/etc/)
34
		${FILESDIR}/02-nfs.patch:-p1
35
37
36
USES=		python
37
USE_PYTHON=	autoplist distutils
38
39
post-patch:
38
post-patch:
40
	@${ECHO_CMD} "os-brick configuration at ${PREFIX}/etc/os-brick/rootwrap.d" >> \
39
	# Prevent the installation of files into ${ETCDIR} by distutils. We do it
41
		${WRKSRC}/etc/os-brick.readme
40
	# manually in the post-install target
42
	@${ECHO_CMD} "os-brick configuration" >> ${WRKSRC}/etc/os-brick/info
41
	@${REINPLACE_CMD} -e '/etc\//d' ${WRKSRC}/setup.cfg
42
	# Replace (hardcoded) paths of config, documentation and Python files
43
	@${GREP} -Rl -Ee '${MY_REGEX}' --null \
44
		${WRKSRC}/etc ${WRKSRC}/os_brick | \
45
			${XARGS} -0 ${REINPLACE_CMD} -i '' -Ee \
46
				"s,${MY_REGEX},${PREFIX}\1,g"
43
47
48
post-install:
49
	@${MKDIR} ${STAGEDIR}${ETCDIR}/rootwrap.d
50
	${INSTALL_DATA} ${WRKSRC}/etc/os-brick/rootwrap.d/os-brick.filters \
51
		${STAGEDIR}${ETCDIR}/rootwrap.d/os-brick.filters.sample
52
44
.include <bsd.port.mk>
53
.include <bsd.port.mk>
(-)py-os-brick/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1485279938
1
TIMESTAMP = 1539433948
2
SHA256 (os-brick-1.10.0.tar.gz) = b0d69f7b23b98ce5632e3fdea85592a15408156a21692a15486f38bf4736dbd6
2
SHA256 (os-brick-2.3.4.tar.gz) = 637ff2d26ce800aa410a257202c4703a1f672ba500a23b32c5872ee786a8e794
3
SIZE (os-brick-1.10.0.tar.gz) = 140387
3
SIZE (os-brick-2.3.4.tar.gz) = 169329
(-)py-os-brick/files/01-os-type.patch (-47 lines)
Lines 1-47 Link Here
1
From b2edffa81edb25202ec6ed08d131b8fa4153a1d5 Mon Sep 17 00:00:00 2001
2
From: Alexander Nusov <alexander.nusov@nfvexpress.com>
3
Date: Thu, 8 Dec 2016 16:26:21 +0300
4
Subject: [PATCH] add support for freebsd os
5
6
---
7
 os_brick/initiator/__init__.py  | 1 +
8
 os_brick/initiator/connector.py | 4 ++++
9
 2 files changed, 5 insertions(+)
10
11
diff --git a/os_brick/initiator/__init__.py b/os_brick/initiator/__init__.py
12
index 95e0b10..aa91615 100644
13
--- a/os_brick/initiator/__init__.py
14
+++ b/os_brick/initiator/__init__.py
15
@@ -34,6 +34,7 @@ PLATFORM_S390 = 'S390'
16
 OS_TYPE_ALL = 'ALL'
17
 OS_TYPE_LINUX = 'LINUX'
18
 OS_TYPE_WINDOWS = 'WIN'
19
+OS_TYPE_FREEBSD = 'FREEBSD'
20
 
21
 S390X = "s390x"
22
 S390 = "s390"
23
diff --git a/os_brick/initiator/connector.py b/os_brick/initiator/connector.py
24
index 86adfa8..989b8d6 100644
25
--- a/os_brick/initiator/connector.py
26
+++ b/os_brick/initiator/connector.py
27
@@ -51,6 +51,7 @@ PLATFORM_S390 = 'S390'
28
 OS_TYPE_ALL = 'ALL'
29
 OS_TYPE_LINUX = 'LINUX'
30
 OS_TYPE_WINDOWS = 'WIN'
31
+OS_TYPE_FREEBSD = 'FREEBSD'
32
 
33
 S390X = "s390x"
34
 S390 = "s390"
35
@@ -204,6 +205,9 @@ def get_connector_properties(root_helper, my_ip, multipath, enforce_multipath,
36
     props['ip'] = my_ip
37
     props['host'] = host if host else socket.gethostname()
38
 
39
+    if sys.platform.startswith('freebsd'):
40
+        props['os_type'] = OS_TYPE_FREEBSD
41
+
42
     for item in connector_list:
43
         connector = importutils.import_class(item)
44
 
45
-- 
46
2.8.1
47
(-)py-os-brick/files/02-nfs.patch (-35 lines)
Lines 1-35 Link Here
1
From fe3bf36779f577ef737108eb1d30b46a75fa4748 Mon Sep 17 00:00:00 2001
2
From: Alexander Nusov <alexander.nusov@nfvexpress.com>
3
Date: Thu, 8 Dec 2016 16:27:57 +0300
4
Subject: [PATCH] initial NFS support
5
6
---
7
 os_brick/initiator/connectors/remotefs.py | 5 +++--
8
 1 file changed, 3 insertions(+), 2 deletions(-)
9
10
diff --git a/os_brick/initiator/connectors/remotefs.py b/os_brick/initiator/connectors/remotefs.py
11
index 50f11c1..f22b652 100644
12
--- a/os_brick/initiator/connectors/remotefs.py
13
+++ b/os_brick/initiator/connectors/remotefs.py
14
@@ -26,6 +26,8 @@ LOG = logging.getLogger(__name__)
15
 class RemoteFsConnector(base.BaseLinuxConnector):
16
     """Connector class to attach/detach NFS and GlusterFS volumes."""
17
 
18
+    os_type = initiator.OS_TYPE_FREEBSD
19
+
20
     def __init__(self, mount_type, root_helper, driver=None,
21
                  execute=None,
22
                  device_scan_attempts=initiator.DEVICE_SCAN_ATTEMPTS_DEFAULT,
23
@@ -35,8 +37,7 @@ class RemoteFsConnector(base.BaseLinuxConnector):
24
         mount_type_lower = mount_type.lower()
25
         if conn:
26
             mount_point_base = conn.get('mount_point_base')
27
-            if mount_type_lower in ('nfs', 'glusterfs', 'scality',
28
-                                    'quobyte', 'vzstorage'):
29
+            if mount_type_lower in ('nfs',):
30
                 kwargs[mount_type_lower + '_mount_point_base'] = (
31
                     kwargs.get(mount_type_lower + '_mount_point_base') or
32
                     mount_point_base)
33
-- 
34
2.8.1
35
(-)py-os-brick/pkg-descr (+5 lines)
Lines 1-3 Link Here
1
OpenStack Cinder brick library for managing local volume attaches
1
OpenStack Cinder brick library for managing local volume attaches
2
2
3
Features:
4
5
- Discovery of volumes being attached to a host for many transport protocols.
6
- Removal of volumes from a host.
7
3
WWW: https://pypi.org/project/os-brick/
8
WWW: https://pypi.org/project/os-brick/
(-)py-os-brick/pkg-plist (+4 lines)
Line 0 Link Here
1
@dir %%ETCDIR%%
2
@owner root
3
@dir %%ETCDIR%%/rootwrap.d
4
@sample %%ETCDIR%%/rootwrap.d/os-brick.filters.sample

Return to bug 230136