From 178e5ef74937d6f6a2d1683b55c68ea267dfd25f Mon Sep 17 00:00:00 2001 From: richbrowne Date: Thu, 12 Jan 2017 21:36:44 -0700 Subject: [PATCH 1/4] Update version strings to 8.2.0.b2 for beta release. Issues: Fixes #365 Problem: Documentation needs to reflect latest version. Analysis: Replace version string from 8.0.2.b1 to 8.0.2.b2 Tests: --- docs/includes/topic_install-f5-lbaasv2-driver.rst | 10 +++++----- docs/map_before-you-begin.rst | 2 +- docs/release_notes.rst | 3 +-- f5lbaasdriver/__init__.py | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/docs/includes/topic_install-f5-lbaasv2-driver.rst b/docs/includes/topic_install-f5-lbaasv2-driver.rst index 68c973a9f..2661aec31 100644 --- a/docs/includes/topic_install-f5-lbaasv2-driver.rst +++ b/docs/includes/topic_install-f5-lbaasv2-driver.rst @@ -10,7 +10,7 @@ Quick Start .. code-block:: text - $ sudo pip install git+https://github.com/F5Networks/f5-openstack-lbaasv2-driver@v8.2.0.b1 + $ sudo pip install git+https://github.com/F5Networks/f5-openstack-lbaasv2-driver@v8.2.0.b2 .. tip:: @@ -37,13 +37,13 @@ The ``f5-openstack-lbaasv2-driver`` package can be installed using ``dpkg``. .. code-block:: bash - $ curl –L –O https://github.com/F5Networks/f5-openstack-lbaasv2-driver/releases/download/v8.2.0.b1/python-f5-openstack-lbaasv2-driver_8.2.0.b1-1_1404_all.deb + $ curl –L –O https://github.com/F5Networks/f5-openstack-lbaasv2-driver/releases/download/v8.2.0.b2/python-f5-openstack-lbaasv2-driver_8.2.0.b2-1_1404_all.deb 2. Install the package on the Neutron controller: .. code-block:: bash - $ sudo dpkg –i python-f5-openstack-lbaasv2-driver_8.2.0.b1-1_1404_all.deb + $ sudo dpkg –i python-f5-openstack-lbaasv2-driver_8.2.0.b2-1_1404_all.deb RPM Package ``````````` @@ -54,12 +54,12 @@ The ``f5-openstack-lbaasv2-driver`` package can be installed using ``rpm``. .. code-block:: bash - $ curl –L –O https://github.com/F5Networks/f5-openstack-lbaasv2-driver/releases/download/v8.2.0.b1/f5-openstack-lbaasv2-driver-8.2.0.b1-1.el7.noarch.rpm + $ curl –L –O https://github.com/F5Networks/f5-openstack-lbaasv2-driver/releases/download/v8.2.0.b2/f5-openstack-lbaasv2-driver-8.2.0.b2-1.el7.noarch.rpm 2. Install the package on the Neutron controller: .. code-block:: bash - $ sudo rpm –ivh f5-openstack-lbaasv2-driver-8.2.0.b1-1.el7.noarch.rpm + $ sudo rpm –ivh f5-openstack-lbaasv2-driver-8.2.0.b2-1.el7.noarch.rpm diff --git a/docs/map_before-you-begin.rst b/docs/map_before-you-begin.rst index 9c95004cb..f1db1fae7 100644 --- a/docs/map_before-you-begin.rst +++ b/docs/map_before-you-begin.rst @@ -59,7 +59,7 @@ Install the F5 Agent .. code-block:: text - $ sudo pip install git+https://github.com/F5Networks/f5-openstack-agent@v8.2.0.b1 + $ sudo pip install git+https://github.com/F5Networks/f5-openstack-agent@v8.2.0.b2 .. tip:: diff --git a/docs/release_notes.rst b/docs/release_notes.rst index 4eac274b8..bc0d331fb 100644 --- a/docs/release_notes.rst +++ b/docs/release_notes.rst @@ -13,10 +13,9 @@ Release Highlights This release introduces the following: -- load balancer statistics (e.g., ``neutron lbaas-loadbalancer-stats``) - Bug fixes -See the `changelog `_ for the full list of changes in this release. +See the `changelog `_ for the full list of changes in this release. Caveats ------- diff --git a/f5lbaasdriver/__init__.py b/f5lbaasdriver/__init__.py index 18b434ca0..541a49cd7 100644 --- a/f5lbaasdriver/__init__.py +++ b/f5lbaasdriver/__init__.py @@ -1 +1 @@ -__version__ = "8.2.0.b1" +__version__ = "8.2.0.b2" From 84fc64917b9db9e4ba3010df8f306e4bfe28cd9a Mon Sep 17 00:00:00 2001 From: richbrowne Date: Tue, 17 Jan 2017 13:13:29 -0700 Subject: [PATCH 2/4] Update version strings to 8.2.0 for release Issues: Fixes #367 Problem: Documentation needs to reflect version Analysis: Replace version string from 8.20.b2 to 8.2.0 Tests: --- docs/includes/topic_differentiated-services.rst | 1 + docs/includes/topic_install-f5-lbaasv2-driver.rst | 10 +++++----- docs/map_before-you-begin.rst | 2 +- docs/release_notes.rst | 3 ++- f5lbaasdriver/__init__.py | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/docs/includes/topic_differentiated-services.rst b/docs/includes/topic_differentiated-services.rst index 8f05d6160..0ea09620f 100644 --- a/docs/includes/topic_differentiated-services.rst +++ b/docs/includes/topic_differentiated-services.rst @@ -53,6 +53,7 @@ You can use the :ref:`F5 environment generator` to automatically generate, and c $ sudo add_f5agent_environment +The environment name is limited to 8 characters in length. Configure the F5 Agent `````````````````````` diff --git a/docs/includes/topic_install-f5-lbaasv2-driver.rst b/docs/includes/topic_install-f5-lbaasv2-driver.rst index 2661aec31..0cc53ab2e 100644 --- a/docs/includes/topic_install-f5-lbaasv2-driver.rst +++ b/docs/includes/topic_install-f5-lbaasv2-driver.rst @@ -10,7 +10,7 @@ Quick Start .. code-block:: text - $ sudo pip install git+https://github.com/F5Networks/f5-openstack-lbaasv2-driver@v8.2.0.b2 + $ sudo pip install git+https://github.com/F5Networks/f5-openstack-lbaasv2-driver@v8.2.0 .. tip:: @@ -37,13 +37,13 @@ The ``f5-openstack-lbaasv2-driver`` package can be installed using ``dpkg``. .. code-block:: bash - $ curl –L –O https://github.com/F5Networks/f5-openstack-lbaasv2-driver/releases/download/v8.2.0.b2/python-f5-openstack-lbaasv2-driver_8.2.0.b2-1_1404_all.deb + $ curl –L –O https://github.com/F5Networks/f5-openstack-lbaasv2-driver/releases/download/v8.2.0/python-f5-openstack-lbaasv2-driver_8.2.0-1_1404_all.deb 2. Install the package on the Neutron controller: .. code-block:: bash - $ sudo dpkg –i python-f5-openstack-lbaasv2-driver_8.2.0.b2-1_1404_all.deb + $ sudo dpkg –i python-f5-openstack-lbaasv2-driver_8.2.0-1_1404_all.deb RPM Package ``````````` @@ -54,12 +54,12 @@ The ``f5-openstack-lbaasv2-driver`` package can be installed using ``rpm``. .. code-block:: bash - $ curl –L –O https://github.com/F5Networks/f5-openstack-lbaasv2-driver/releases/download/v8.2.0.b2/f5-openstack-lbaasv2-driver-8.2.0.b2-1.el7.noarch.rpm + $ curl –L –O https://github.com/F5Networks/f5-openstack-lbaasv2-driver/releases/download/v8.2.0/f5-openstack-lbaasv2-driver-8.2.0-1.el7.noarch.rpm 2. Install the package on the Neutron controller: .. code-block:: bash - $ sudo rpm –ivh f5-openstack-lbaasv2-driver-8.2.0.b2-1.el7.noarch.rpm + $ sudo rpm –ivh f5-openstack-lbaasv2-driver-8.2.0-1.el7.noarch.rpm diff --git a/docs/map_before-you-begin.rst b/docs/map_before-you-begin.rst index f1db1fae7..73e088f7c 100644 --- a/docs/map_before-you-begin.rst +++ b/docs/map_before-you-begin.rst @@ -59,7 +59,7 @@ Install the F5 Agent .. code-block:: text - $ sudo pip install git+https://github.com/F5Networks/f5-openstack-agent@v8.2.0.b2 + $ sudo pip install git+https://github.com/F5Networks/f5-openstack-agent@v8.2.0 .. tip:: diff --git a/docs/release_notes.rst b/docs/release_notes.rst index bc0d331fb..8d4f7a0bf 100644 --- a/docs/release_notes.rst +++ b/docs/release_notes.rst @@ -13,9 +13,10 @@ Release Highlights This release introduces the following: +- load balancer statistics (e.g., ``neutron lbaas-loadbalancer-stats``) - Bug fixes -See the `changelog `_ for the full list of changes in this release. +See the `changelog `_ for the full list of changes in this release. Caveats ------- diff --git a/f5lbaasdriver/__init__.py b/f5lbaasdriver/__init__.py index 541a49cd7..26ef49ae9 100644 --- a/f5lbaasdriver/__init__.py +++ b/f5lbaasdriver/__init__.py @@ -1 +1 @@ -__version__ = "8.2.0.b2" +__version__ = "8.2.0" From d87421947a54d691fdccb8a1a41ff97abef038f4 Mon Sep 17 00:00:00 2001 From: richbrowne Date: Tue, 17 Jan 2017 14:18:19 -0700 Subject: [PATCH 3/4] Fix requirements.test dependency order --- requirements.test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.test.txt b/requirements.test.txt index e9938ea45..cfb37d210 100644 --- a/requirements.test.txt +++ b/requirements.test.txt @@ -1,11 +1,11 @@ . +git+https://github.com/F5Networks/f5-common-python.git@v2.1.0 git+https://github.com/F5Networks/pytest-symbols.git git+https://github.com/F5Networks/f5-openstack-test.git # TODO(paul): Must change this before it collapses into mitaka git+https://github.com/openstack/neutron.git@stable/mitaka git+https://github.com/openstack/neutron-lbaas.git@8.3.0 git+https://github.com/openstack/tempest.git@12.0.0 -git+https://github.com/F5Networks/f5-common-python.git@v2.1.0 mock==1.3.0 pytest==2.9.1 From a64b710eaa252195c5b553a211e69197eb69f510 Mon Sep 17 00:00:00 2001 From: richbrowne Date: Tue, 17 Jan 2017 14:30:35 -0700 Subject: [PATCH 4/4] Resolve merge conflict --- docs/includes/topic_install-f5-lbaasv2-driver.rst | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/includes/topic_install-f5-lbaasv2-driver.rst b/docs/includes/topic_install-f5-lbaasv2-driver.rst index 5da356875..c7ab4b575 100644 --- a/docs/includes/topic_install-f5-lbaasv2-driver.rst +++ b/docs/includes/topic_install-f5-lbaasv2-driver.rst @@ -42,11 +42,7 @@ The ``f5-openstack-lbaasv2-driver`` package can be installed using ``dpkg``. .. code-block:: bash -<<<<<<< HEAD $ sudo dpkg –i python-f5-openstack-lbaasv2-driver_9.2.0-1_1404_all.deb -======= - $ sudo dpkg –i python-f5-openstack-lbaasv2-driver_8.2.0-1_1404_all.deb ->>>>>>> upstream/liberty RPM Package ```````````