diff --git a/doc/source/_templates/layout.html b/doc/source/_templates/layout.html
index e6b6ae92..c830d8b2 100644
--- a/doc/source/_templates/layout.html
+++ b/doc/source/_templates/layout.html
@@ -23,7 +23,6 @@
Branches
diff --git a/doc/source/advanced_deployment/root_device.rst b/doc/source/advanced_deployment/root_device.rst
index 7c6eb026..73c437ff 100644
--- a/doc/source/advanced_deployment/root_device.rst
+++ b/doc/source/advanced_deployment/root_device.rst
@@ -7,7 +7,7 @@ If your hardware has several hard drives, it's highly recommended that you
specify the exact device to be used during introspection and deployment
as a root device. This is done by setting a ``root_device`` property on the
node in Ironic. Please refer to the `Ironic root device hints documentation`_
-for more details (note that the `Liberty release version`_ lacks some fields).
+for more details.
For example::
@@ -104,4 +104,3 @@ with the Mitaka release. Also note that the ``name`` field, while convenient,
Do not forget to re-run the introspection after setting the root device hints.
.. _Ironic root device hints documentation: http://docs.openstack.org/developer/ironic/deploy/install-guide.html#specifying-the-disk-for-deployment
-.. _Liberty release version: http://docs.openstack.org/developer/ironic/liberty/deploy/install-guide.html#specifying-the-disk-for-deployment
diff --git a/doc/source/advanced_deployment/ssl.rst b/doc/source/advanced_deployment/ssl.rst
index b06be43c..9254e56a 100644
--- a/doc/source/advanced_deployment/ssl.rst
+++ b/doc/source/advanced_deployment/ssl.rst
@@ -223,7 +223,7 @@ be added as in the other values to indicate that this is a multi-line value.
:class: stable
In Newton, the EndpointMap and SSL certificates have been decoupled,
- but in Mitaka and Liberty it may be necessary to modify the EndpointMap
+ but in Mitaka it may be necessary to modify the EndpointMap
in enable-tls.yaml
When the certificate's common name is set to the public VIP, all instances
diff --git a/doc/source/basic_deployment/basic_deployment_cli.rst b/doc/source/basic_deployment/basic_deployment_cli.rst
index ea103d69..dcffa8d0 100644
--- a/doc/source/basic_deployment/basic_deployment_cli.rst
+++ b/doc/source/basic_deployment/basic_deployment_cli.rst
@@ -108,20 +108,6 @@ created on the undercloud, one should use a non-root user.
.. admonition:: Stable Branch
:class: stable
- .. admonition:: Liberty
- :class: liberty
-
- ::
-
- STABLE_RELEASE="liberty"
-
- .. admonition:: Ceph
- :class: ceph
-
- ::
-
- export DIB_YUM_REPO_CONF="$DIB_YUM_REPO_CONF /etc/yum.repos.d/CentOS-Ceph-Hammer.repo"
-
.. admonition:: Mitaka
:class: mitaka
@@ -200,15 +186,6 @@ created on the undercloud, one should use a non-root user.
rhel-7-server-rhceph-1.3-osd-rpms
rhel-7-server-rhceph-1.3-tools-rpms
- .. admonition:: Liberty
- :class: liberty
-
- ::
-
- rhel-7-server-rhceph-1.3-mon-rpms
- rhel-7-server-rhceph-1.3-osd-rpms
- rhel-7-server-rhceph-1.3-tools-rpms
-
.. admonition:: RHEL Satellite Registration
:class: satellite
@@ -286,12 +263,6 @@ The file to be imported may be either JSON, YAML or CSV format, and
the type is detected via the file extension (json, yaml, csv).
The file format is documented in :ref:`instackenv`.
-.. admonition:: Liberty
- :class: liberty
-
- For TripleO release Liberty and older an explicit ``--json`` or ``--csv``
- flag is required for JSON and CSV formats accordingly.
-
.. admonition:: Stable Branch
:class: stable
diff --git a/doc/source/index.rst b/doc/source/index.rst
index afe5f5d9..54324524 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -77,11 +77,6 @@ Linux (RHEL). These steps are marked as follows:
Step that should only be run when choosing to use components from their
stable branches rather than using packages/source based on current master.
-.. admonition:: Liberty
- :class: liberty
-
- Step that should only be run when installing from the Liberty stable branch.
-
.. admonition:: Mitaka
:class: mitaka
diff --git a/doc/source/repositories.txt b/doc/source/repositories.txt
index be2d5799..50f75089 100644
--- a/doc/source/repositories.txt
+++ b/doc/source/repositories.txt
@@ -4,31 +4,6 @@
Enable the appropriate repos for the desired release, as indicated below.
Do not enable any other repos not explicitly marked for that release.
- .. admonition:: Liberty
- :class: liberty ktol
-
- Enable latest RDO Liberty Delorean repository for all packages
-
- ::
-
- sudo curl -L -o /etc/yum.repos.d/delorean-liberty.repo https://trunk.rdoproject.org/centos7-liberty/current/delorean.repo
-
- Enable the Liberty Delorean Deps repository
-
- ::
-
- sudo curl -L -o /etc/yum.repos.d/delorean-deps-liberty.repo http://trunk.rdoproject.org/centos7-liberty/delorean-deps.repo
-
- .. admonition:: Ceph
- :class: ceph
-
- Enable the CentOS Storage SIG Ceph/Hammer repository if using Ceph
-
- ::
-
- sudo yum -y install --enablerepo=extras centos-release-ceph-hammer
- sudo sed -i -e 's%gpgcheck=.*%gpgcheck=0%' /etc/yum.repos.d/CentOS-Ceph-Hammer.repo
-
.. admonition:: Mitaka
:class: mitaka ltom
diff --git a/doc/source/troubleshooting/troubleshooting-nodes.rst b/doc/source/troubleshooting/troubleshooting-nodes.rst
index ac796409..3a3f0b40 100644
--- a/doc/source/troubleshooting/troubleshooting-nodes.rst
+++ b/doc/source/troubleshooting/troubleshooting-nodes.rst
@@ -130,29 +130,3 @@ Introspection for a node can be stopped with the following command::
openstack baremetal introspection abort
-.. admonition:: Liberty
- :class: liberty
-
- The ``abort`` command above was introduced in the Mitaka release.
- For older versions the recommended path is to wait until it times out.
- Changing ``timeout`` setting in ``/etc/ironic-inspector/inspector.conf``
- may be used to reduce the timeout from 1 hour (which is usually too much,
- especially on virtual environments).
-
- If you do need to stop introspection **for all nodes** right now on
- the Liberty release, you can do the following for each node::
-
- ironic node-set-power-state UUID off
-
- then remove ironic-inspector cache, rebuild it and restart
- ironic-inspector::
-
- rm /var/lib/ironic-inspector/inspector.sqlite
- sudo ironic-inspector-dbsync --config-file /etc/ironic-inspector/inspector.conf upgrade
- sudo systemctl restart openstack-ironic-inspector
-
- Note that this procedure is not recommended and may have unexpected side
- effects.
-
-.. _ironic-inspector troubleshooting documentation: http://docs.openstack.org/developer/ironic-inspector/troubleshooting.html
-.. _the dynamic-login element: https://github.com/openstack/diskimage-builder/tree/master/elements/dynamic-login