Merge pull request #653 from mattgreene/mitaka

Merge Liberty to Mitaka
F5Networks · Apr 7, 2017 · 2c91ae3 · 2c91ae3
2 parents bba1492 + 9f09ac1
commit 2c91ae3
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 41 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -319,3 +319,13 @@
     'f5sdk': (
     'http://f5-sdk.readthedocs.io/en/latest/', None),
     }
+
+rst_epilog = '''
+.. |f5_agent_pip_url| replace:: git+https://github.com/F5Networks/f5-openstack-agent@v%(version)s
+.. |f5_agent_deb_url| replace:: https://github.com/F5Networks/f5-openstack-agent/releases/download/v%(version)s/python-f5-openstack-agent_%(version)s-1_1404_all.deb
+.. |f5_agent_rpm_url| replace:: https://github.com/F5Networks/f5-openstack-agent/releases/download/v%(version)s/f5-openstack-agent-%(version)s-1.el7.noarch.rpm
+.. |f5_agent_deb_package| replace:: python-f5-openstack-agent_%(version)s-1_1404_all.deb
+.. |f5_agent_rpm_package| replace:: f5-openstack-agent-%(version)s-1.el7.noarch.rpm
+''' % {
+  'version': version
+}
diff --git a/docs/index.rst b/docs/index.rst
@@ -20,7 +20,6 @@ Overview
     :hidden:
     :maxdepth: 1
 
-    release_notes
 
 
 Installation

diff --git a/docs/release_notes.rst b/docs/release_notes.rst
diff --git a/docs/topic_install-f5-agent.rst b/docs/topic_install-f5-agent.rst
@@ -6,9 +6,9 @@ Quick Start
 
 .. rubric:: Install the ``f5-openstack-agent`` package for v |release|:
 
-.. code-block:: text
+.. parsed-literal::
 
-    $ sudo pip install git+https://github.com/F5Networks/f5-openstack-agent@v9.3.0.b2
+    $ sudo pip install |f5_agent_pip_url|
 
 .. tip::
 
@@ -36,10 +36,10 @@ The ``f5-openstack-agent`` package can be installed using ``dpkg`` tools.
 
 2. Download and install the f5-openstack-agent:
 
-.. code-block:: bash
+.. parsed-literal::
 
-    $ curl -L -O https://github.com/F5Networks/f5-openstack-agent/releases/download/v9.3.0.b2/python-f5-openstack-agent_9.3.0.b2-1_1404_all.deb
-    $ sudo dpkg –i python-f5-openstack-agent_9.3.0.b2-1_1404_all.deb
+    $ curl -L -O |f5_agent_deb_url|
+    $ sudo dpkg –i |f5_agent_deb_package|
 
 
 RPM Package
@@ -58,10 +58,11 @@ The ``f5-openstack-agent`` package can be installed using ``rpm`` tools.
 
 2. Download and install the f5-openstack-agent:
 
-.. code-block:: bash
+.. parsed-literal::
+
+    $ curl -L -O |f5_agent_rpm_url|
+    $ sudo rpm –ivh |f5_agent_rpm_package|
 
-    $ curl -L -O https://github.com/F5Networks/f5-openstack-agent/releases/download/v9.3.0.b2/f5-openstack-agent-9.3.0.b2-1.el7.noarch.rpm
-    $ sudo rpm –ivh f5-openstack-agent-9.3.0.b2-1.el7.noarch.rpm
 
 
 Next Steps

diff --git a/f5_openstack_agent/__init__.py b/f5_openstack_agent/__init__.py
@@ -1 +1 @@
-__version__ = "9.3.0.b2"
+__version__ = "9.3.0"