diff --git a/.travis.yml b/.travis.yml index 1b48d139b..9c1a5bbc1 100755 --- a/.travis.yml +++ b/.travis.yml @@ -69,7 +69,7 @@ after_success: deploy: - provider: releases api_key: - secure: lTash9wrbwY5rsdl+ZfhYZ+Iqt2EdvZNqrq6FlLT6L4Wc4/RYCDLFwY2qrDb/n1XI3g/XhOCTyYMCu9URrw0HAY45HcAgOcEABNcAGfs/aBk5uB+l/V/42QKB+oAR9RR9qves5PJGBpJcBym9oswcxblBo8L6Z2o/yFzyGo3tHKVopTZoIw+hPqt5eAClPz8FX0ZIUZqH1iUiqMj1JJWvO9DRWECcjt4pr5HuY3u32qocQP4DUY1WQwI/R6iye5VPTAbWnsIBChJcJF1HAbsVa5IhQHhSo03RCJwZay/NF0btc9dKvIyrwqhQIUZX/RcDPvbs7TP02zg9O27HBAts2ivVRoBulN9dsHGiWGXMMQjavZGsdZ/TddKQxUvWoUKv+nHQyWGbyrE4smDHrex29NR/WgB/kHSAkNyUU1rZs8ALaoab5LY3Z0WmrFlHFs4HDb4YG+//0ODVppRe+Z8uFFnSsN4fjG9Xok+Tl+Gb9XM6/LNu+C+5DCG2VfPCnp2UGzmmo9Hm6ODhWauCR9DfJk1dUTVYb871I3ina0rwm2NQ04bKv0UHGZ2FWpq/KGx+jvXW8F54cWIluU/ze2MrJF/z9uKyTluEbDNBEr9/LaZoG22MBzHZB4xK0cEy+CSwGdOredCDCyEM7dsLlnE8ruiujbCAMvdjsHH4bu4MjU= + secure: "iFpUAG1J8pnxL/lyIm4t18gQx0OaajpXWSEIQr0QeiKFKAj5mZ0rTr4XD4ditLKZ7Ar/ZcPlD+wJ6k4MEVjrkDs+SxSgMKoygXIu35m4pxNpUNPbyR1q0etfpnyMWr7KZWPhqzQw4FbQgAdNvA4l0CQi9ufaFIzE0gZl/uKW+CJbjRp+VrFKSeK1BuUSrjzS9iwwPy4DnxzOxmA8d3PLj/BCmh+rdjLHvdEAdVO5mRn6h2uTOTYsrYY+QBgI0Ibi1oiy6hkrW5snqEpaeg5w5fbcI9zds3QXWJucQSjBF8EFVgwcHHDM1Z339pnxbYHWZg683Q9tMjpUhgrc+CJxVW1O+vUaVkCa/6Js8B46RwgpZmBOWotxvYFfL/sxrvhh7mxnl/KSAHxMJ1NoReaS8SLBHqQu12/jyOQlblj+/jB/P/jAoj8R7S2p83FyNNuTg22zEV7oXIruaEsz4qfMNPR3RfVOTYzvKZPq6II67lHd5qNjAWNLpeDisBqHQ8dmE53Q10DtCLbzvzlLHbLtFExYToG1vwWNoe641vCa/ZEII2e0t0+tRIdXJ80Jgt2hHdTPpng0Xgsthf05SCwi2A9p0exVJt95ty7kEEUrpUZ9yEGFyO7H3kDvK7gk345BsMo7wIpoXgpp4uRwHy1Ylw3ZJPZG/J8Ju2D1eHtbF5Y=" file: - ${PKG_RELEASE_EL7} - ${PKG_RELEASE_EL7}.md5 diff --git a/deb_setup_requirements.txt b/deb_setup_requirements.txt index 1439f55a9..c7dd99eb6 100644 --- a/deb_setup_requirements.txt +++ b/deb_setup_requirements.txt @@ -1,5 +1,5 @@ # this file stores required dependencies of f5 agent for ubuntu -f5-sdk==3.0.11.4 +f5-sdk>=3.0.11.4 pyasn1-modules>=0.0.3-1 cryptography>=1.0.1-1 diff --git a/docs/RELEASE-NOTES.rst b/docs/RELEASE-NOTES.rst index 6db5bd1c8..1ba977e08 100644 --- a/docs/RELEASE-NOTES.rst +++ b/docs/RELEASE-NOTES.rst @@ -5,6 +5,20 @@ Release Notes for F5 Openstack Agent ==================================== +v9.9.40.patch3 (Pike, Queens) +-------------------------------------------- +NOTE: This version of F5 Openstack Agent supports Pike and Queens Openstack releases. + +Added Functionality +``````````````````` +* [OPENSTACK-2587] Upgrade to python sdk 3.0.11.5 + +Bug Fixes +````````` + +Limitations +``````````` + v9.9.40.patch2 (Pike, Queens) -------------------------------------------- NOTE: This version of F5 Openstack Agent supports Pike and Queens Openstack releases. diff --git a/docs/conf.py b/docs/conf.py index 88897ebc2..72a82f6ca 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -76,7 +76,7 @@ release = VERSION # F5 SDK release version should be set here -f5_sdk_version = '3.0.11.4' +f5_sdk_version = '3.0.11.5' # F5 icontrol REST version should be set here f5_icontrol_version = '1.3.0' diff --git a/f5_openstack_agent/__init__.py b/f5_openstack_agent/__init__.py index 5945be493..813906530 100644 --- a/f5_openstack_agent/__init__.py +++ b/f5_openstack_agent/__init__.py @@ -1 +1 @@ -__version__ = "9.9.40.patch2" +__version__ = "9.9.40.patch3" diff --git a/requirements.unittest.txt b/requirements.unittest.txt index 696193a60..732992d0f 100644 --- a/requirements.unittest.txt +++ b/requirements.unittest.txt @@ -17,3 +17,5 @@ oslo.messaging===4.6.1 cryptography>=1.2.3 pyasn1-modules>=0.0.8 + +pika<1.3.0 diff --git a/rpm_setup_requirements.txt b/rpm_setup_requirements.txt index 7cdffd627..bd7e25e83 100644 --- a/rpm_setup_requirements.txt +++ b/rpm_setup_requirements.txt @@ -1,5 +1,5 @@ # this file stores required dependencies of f5 agent for redhat -f5-sdk==3.0.11.4 +f5-sdk>=3.0.11.4 python2-cryptography>=1.2.3 python2-pyasn1-modules>=0.0.8 diff --git a/setup.py b/setup.py index 19e586cdd..fe1eb681e 100644 --- a/setup.py +++ b/setup.py @@ -49,6 +49,5 @@ 'update-lb = f5_openstack_agent.lbaasv2.drivers.bigip.update_lb:update_lb' ] }, - install_requires=['f5-sdk==3.0.11.4'] + install_requires=['f5-sdk>=3.0.11.4'] ) -