forked from pool/aws-efs-utils
Accepting request 754352 from home:glaubitz:branches:Cloud:Tools
- Update to version 1.16
+ Support Python 3 for tests
- from version 1.15
+ Properly support Python3
- from version 1.14
+ Tolerate EFS state directory existing during mount
- from version 1.13
+ Change watchdog configuration so it stops after all file systems are unmounted
- from version 1.12
+ Update stunnel idle timeout
* The default stunnel idle timeout is many hours. By setting it to a value based
on the NFS lease length we can recover from network partitions sooner.
- from version 1.11
+ Add support for RHEL8
* Fixes Python shebangs to work on systems without a default "python" version.
* Fixes watchdog process not being properly started on systemd systems.
- from version 1.10
+ Update to default configuration that disables OCSP
* To use OCSP, the client accessing EFS must be able to reach the Amazon Certificate
Authority (CA). To maximize file system availability in the event that the CA is
not reachable from your VPC, the EFS mount helper no longer enables OCSP by default.
- Don't enable testsuite as it is currently failing
+ https://github.com/aws/efs-utils/issues/24
- Drop patches merged upstream
+ efs-switchparser.patch
- Update BuildRequires from requirements.txt
OBS-URL: https://build.opensuse.org/request/show/754352
OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/aws-efs-utils?expand=0&rev=9
This commit is contained in:
Git OBS Bridge
parent
96a69a286a
commit
34357925cf
@ -1,3 +1,33 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Dec 5 11:42:38 UTC 2019 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
|
||||||
|
|
||||||
|
- Update to version 1.16
|
||||||
|
+ Support Python 3 for tests
|
||||||
|
- from version 1.15
|
||||||
|
+ Properly support Python3
|
||||||
|
- from version 1.14
|
||||||
|
+ Tolerate EFS state directory existing during mount
|
||||||
|
- from version 1.13
|
||||||
|
+ Change watchdog configuration so it stops after all file systems are unmounted
|
||||||
|
- from version 1.12
|
||||||
|
+ Update stunnel idle timeout
|
||||||
|
* The default stunnel idle timeout is many hours. By setting it to a value based
|
||||||
|
on the NFS lease length we can recover from network partitions sooner.
|
||||||
|
- from version 1.11
|
||||||
|
+ Add support for RHEL8
|
||||||
|
* Fixes Python shebangs to work on systems without a default "python" version.
|
||||||
|
* Fixes watchdog process not being properly started on systemd systems.
|
||||||
|
- from version 1.10
|
||||||
|
+ Update to default configuration that disables OCSP
|
||||||
|
* To use OCSP, the client accessing EFS must be able to reach the Amazon Certificate
|
||||||
|
Authority (CA). To maximize file system availability in the event that the CA is
|
||||||
|
not reachable from your VPC, the EFS mount helper no longer enables OCSP by default.
|
||||||
|
- Don't enable testsuite as it is currently failing
|
||||||
|
+ https://github.com/aws/efs-utils/issues/24
|
||||||
|
- Drop patches merged upstream
|
||||||
|
+ efs-switchparser.patch
|
||||||
|
- Update BuildRequires from requirements.txt
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Apr 9 22:29:17 UTC 2019 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
|
Tue Apr 9 22:29:17 UTC 2019 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package aws-efs-utils
|
# spec file for package aws-efs-utils
|
||||||
#
|
#
|
||||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2019 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -17,14 +17,29 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: aws-efs-utils
|
Name: aws-efs-utils
|
||||||
Version: 1.7
|
Version: 1.16
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Utilities for using the EFS file systems
|
Summary: Utilities for using the EFS file systems
|
||||||
License: MIT
|
License: MIT
|
||||||
Group: System/Management
|
Group: System/Management
|
||||||
Url: https://github.com/aws/efs-utils
|
URL: https://github.com/aws/efs-utils
|
||||||
Source0: https://github.com/aws/efs-utils/archive/v%{version}.tar.gz
|
Source0: https://github.com/aws/efs-utils/archive/v%{version}.tar.gz
|
||||||
Patch: efs-switchparser.patch
|
BuildRequires: python3-attrs >= 17.4.0
|
||||||
|
BuildRequires: python3-coverage >= 4.5
|
||||||
|
BuildRequires: python3-flake8 >= 3.5.0
|
||||||
|
BuildRequires: python3-mccabe >= 0.6.1
|
||||||
|
BuildRequires: python3-mock >= 2.0.0
|
||||||
|
BuildRequires: python3-pbr >= 3.1.1
|
||||||
|
BuildRequires: python3-pluggy >= 0.6.0
|
||||||
|
BuildRequires: python3-py >= 1.5.2
|
||||||
|
BuildRequires: python3-pycodestyle >= 2.3.1
|
||||||
|
BuildRequires: python3-pyflakes >= 1.6.0
|
||||||
|
BuildRequires: python3-pytest >= 3.4.0
|
||||||
|
BuildRequires: python3-pytest-cov >= 2.5.1
|
||||||
|
BuildRequires: python3-pytest-html >= 1.16.1
|
||||||
|
BuildRequires: python3-pytest-metadata >= 1.6.0
|
||||||
|
BuildRequires: python3-pytest-mock >= 1.6.3
|
||||||
|
BuildRequires: python3-six >= 1.11.0
|
||||||
BuildRequires: systemd
|
BuildRequires: systemd
|
||||||
BuildRequires: systemd-rpm-macros
|
BuildRequires: systemd-rpm-macros
|
||||||
Requires: nfs-utils
|
Requires: nfs-utils
|
||||||
@ -38,7 +53,6 @@ This package provides utilities for using the EFS file systems.
|
|||||||
%prep
|
%prep
|
||||||
%setup -n efs-utils-%{version}
|
%setup -n efs-utils-%{version}
|
||||||
find . -name "*.py" -exec sed -i 's/env python/python3/' {} +
|
find . -name "*.py" -exec sed -i 's/env python/python3/' {} +
|
||||||
%patch -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# No build required
|
# No build required
|
||||||
|
|||||||
@ -1,102 +0,0 @@
|
|||||||
diff -Nru efs-utils-1.7.orig/src/mount_efs/__init__.py efs-utils-1.7/src/mount_efs/__init__.py
|
|
||||||
--- efs-utils-1.7.orig/src/mount_efs/__init__.py 2019-04-09 20:27:34.000000000 +0200
|
|
||||||
+++ efs-utils-1.7/src/mount_efs/__init__.py 2019-04-09 23:59:43.477327640 +0200
|
|
||||||
@@ -44,9 +44,9 @@
|
|
||||||
from logging.handlers import RotatingFileHandler
|
|
||||||
|
|
||||||
try:
|
|
||||||
- import ConfigParser
|
|
||||||
+ import ConfigParser as cp
|
|
||||||
except ImportError:
|
|
||||||
- from configparser import ConfigParser
|
|
||||||
+ import configparser as cp
|
|
||||||
|
|
||||||
try:
|
|
||||||
from urllib2 import urlopen, URLError
|
|
||||||
@@ -537,7 +537,7 @@
|
|
||||||
|
|
||||||
|
|
||||||
def read_config(config_file=CONFIG_FILE):
|
|
||||||
- p = ConfigParser.SafeConfigParser()
|
|
||||||
+ p = cp.ConfigParser()
|
|
||||||
p.read(config_file)
|
|
||||||
return p
|
|
||||||
|
|
||||||
diff -Nru efs-utils-1.7.orig/src/watchdog/__init__.py efs-utils-1.7/src/watchdog/__init__.py
|
|
||||||
--- efs-utils-1.7.orig/src/watchdog/__init__.py 2019-04-09 20:27:34.000000000 +0200
|
|
||||||
+++ efs-utils-1.7/src/watchdog/__init__.py 2019-04-09 23:59:43.477327640 +0200
|
|
||||||
@@ -21,9 +21,9 @@
|
|
||||||
from signal import SIGTERM
|
|
||||||
|
|
||||||
try:
|
|
||||||
- import ConfigParser
|
|
||||||
+ import ConfigParser as cp
|
|
||||||
except ImportError:
|
|
||||||
- from configparser import ConfigParser
|
|
||||||
+ import configparser as cp
|
|
||||||
|
|
||||||
VERSION = '1.7'
|
|
||||||
|
|
||||||
@@ -280,7 +280,7 @@
|
|
||||||
|
|
||||||
|
|
||||||
def read_config(config_file=CONFIG_FILE):
|
|
||||||
- p = ConfigParser.SafeConfigParser()
|
|
||||||
+ p = cp.ConfigParser()
|
|
||||||
p.read(config_file)
|
|
||||||
return p
|
|
||||||
|
|
||||||
diff -Nru efs-utils-1.7.orig/test/mount_efs_test/test_choose_tls_port.py efs-utils-1.7/test/mount_efs_test/test_choose_tls_port.py
|
|
||||||
--- efs-utils-1.7.orig/test/mount_efs_test/test_choose_tls_port.py 2019-04-09 20:27:34.000000000 +0200
|
|
||||||
+++ efs-utils-1.7/test/mount_efs_test/test_choose_tls_port.py 2019-04-09 23:59:43.477327640 +0200
|
|
||||||
@@ -7,9 +7,13 @@
|
|
||||||
#
|
|
||||||
|
|
||||||
import mount_efs
|
|
||||||
-import ConfigParser
|
|
||||||
import socket
|
|
||||||
|
|
||||||
+try:
|
|
||||||
+ import ConfigParser as cp
|
|
||||||
+except ImportError:
|
|
||||||
+ import configparser as cp
|
|
||||||
+
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
from mock import MagicMock
|
|
||||||
@@ -19,7 +23,7 @@
|
|
||||||
|
|
||||||
|
|
||||||
def _get_config():
|
|
||||||
- config = ConfigParser.SafeConfigParser()
|
|
||||||
+ config = cp.ConfigParser()
|
|
||||||
config.add_section(mount_efs.CONFIG_SECTION)
|
|
||||||
config.set(mount_efs.CONFIG_SECTION, 'port_range_lower_bound', str(DEFAULT_TLS_PORT_RANGE_LOW))
|
|
||||||
config.set(mount_efs.CONFIG_SECTION, 'port_range_upper_bound', str(DEFAULT_TLS_PORT_RANGE_HIGH))
|
|
||||||
diff -Nru efs-utils-1.7.orig/test/mount_efs_test/test_write_stunnel_config_file.py efs-utils-1.7/test/mount_efs_test/test_write_stunnel_config_file.py
|
|
||||||
--- efs-utils-1.7.orig/test/mount_efs_test/test_write_stunnel_config_file.py 2019-04-09 20:27:34.000000000 +0200
|
|
||||||
+++ efs-utils-1.7/test/mount_efs_test/test_write_stunnel_config_file.py 2019-04-09 23:59:43.477327640 +0200
|
|
||||||
@@ -7,9 +7,13 @@
|
|
||||||
#
|
|
||||||
|
|
||||||
import mount_efs
|
|
||||||
-import ConfigParser
|
|
||||||
import os
|
|
||||||
|
|
||||||
+try:
|
|
||||||
+ import ConfigParser as cp
|
|
||||||
+except ImportError:
|
|
||||||
+ import configparser as cp
|
|
||||||
+
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
FS_ID = 'fs-deadbeef'
|
|
||||||
@@ -32,7 +36,7 @@
|
|
||||||
if stunnel_check_cert_validity is None:
|
|
||||||
stunnel_check_cert_validity = stunnel_check_cert_validity_supported
|
|
||||||
|
|
||||||
- config = ConfigParser.SafeConfigParser()
|
|
||||||
+ config = cp.ConfigParser()
|
|
||||||
config.add_section(mount_efs.CONFIG_SECTION)
|
|
||||||
config.set(mount_efs.CONFIG_SECTION, 'stunnel_debug_enabled', str(stunnel_debug_enabled))
|
|
||||||
config.set(mount_efs.CONFIG_SECTION, 'stunnel_check_cert_hostname', str(stunnel_check_cert_hostname))
|
|
||||||
3
v1.16.tar.gz
Normal file
3
v1.16.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:110ed7d9dde9569713d8c56f70a2e5aebb40c82063f6f8206025a34d604069df
|
||||||
|
size 30984
|
||||||
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:b9374777da47e1c6be8042546a6139e1d9a21dfca87f37aefd9f78d4a486cf7a
|
|
||||||
size 29384
|
|
||||||
Loading…
Reference in New Issue
Block a user