diff --git a/_custom/custom.css b/_custom/custom.css index 1ae7f78b..7c686a35 100644 --- a/_custom/custom.css +++ b/_custom/custom.css @@ -62,7 +62,6 @@ .portal {background-color: #ded;} .satellite {background-color: #dee;} .stable {background: #eed;} -.mitaka {background: #dee;} .newton {background: #ede;} .ocata {background: #edd;} .centos {background: #fef;} diff --git a/_templates/layout.html b/_templates/layout.html index 92e370cb..c3de3148 100644 --- a/_templates/layout.html +++ b/_templates/layout.html @@ -23,7 +23,6 @@ Branches @@ -54,8 +53,6 @@ Upgrade Version diff --git a/doc/source/advanced_deployment/baremetal_overcloud.rst b/doc/source/advanced_deployment/baremetal_overcloud.rst index afd940f3..1d1a5acc 100644 --- a/doc/source/advanced_deployment/baremetal_overcloud.rst +++ b/doc/source/advanced_deployment/baremetal_overcloud.rst @@ -65,16 +65,6 @@ Then enroll only ``undercloud.json`` in your undercloud:: source stackrc openstack overcloud node import --provide undercloud.json -.. admonition:: Stable Branch - :class: stable - - .. admonition:: Mitaka - :class: mitaka - - For TripleO release Mitaka, the nodes should be imported with:: - - openstack baremetal import undercloud.json - .. admonition:: Virtual :class: virtual diff --git a/doc/source/advanced_deployment/root_device.rst b/doc/source/advanced_deployment/root_device.rst index da0ea58b..2b1858c2 100644 --- a/doc/source/advanced_deployment/root_device.rst +++ b/doc/source/advanced_deployment/root_device.rst @@ -38,16 +38,6 @@ accept a device list in the order of preference, for example:: openstack overcloud node configure --all-manageable --root-device=sdb,sdc,vda -.. admonition:: Stable Branch - :class: stable - - .. admonition:: Mitaka - :class: mitaka - - For TripleO release Mitaka, the boot configuration command is:: - - openstack baremetal configure boot --root-device=sdb,sdc,vda - It can also accept one of two strategies: ``smallest`` will pick the smallest device, ``largest`` will pick the largest one. By default only disk devices larger than 4 GiB are considered at all, set the ``--root-device-minimum-size`` diff --git a/doc/source/advanced_deployment/ssl.rst b/doc/source/advanced_deployment/ssl.rst index 41a746ca..15c32d0f 100644 --- a/doc/source/advanced_deployment/ssl.rst +++ b/doc/source/advanced_deployment/ssl.rst @@ -225,9 +225,7 @@ be added as in the other values to indicate that this is a multi-line value. .. admonition:: Stable Branch :class: stable - In Newton, the EndpointMap and SSL certificates have been decoupled, - but in Mitaka it may be necessary to modify the EndpointMap - in enable-tls.yaml + From Newton, the EndpointMap and SSL certificates have been decoupled. When the certificate's common name is set to the public VIP, all instances of ``CLOUDNAME`` in enable-tls.yaml must be replaced with ``IP_ADDRESS``. diff --git a/doc/source/basic_deployment/basic_deployment_cli.rst b/doc/source/basic_deployment/basic_deployment_cli.rst index b5034f09..574f99da 100644 --- a/doc/source/basic_deployment/basic_deployment_cli.rst +++ b/doc/source/basic_deployment/basic_deployment_cli.rst @@ -112,20 +112,6 @@ created on the undercloud, one should use a non-root user. .. admonition:: Stable Branch :class: stable - .. admonition:: Mitaka - :class: mitaka - - :: - - export STABLE_RELEASE="mitaka" - - .. admonition:: Ceph - :class: ceph - - :: - - export DIB_YUM_REPO_CONF="$DIB_YUM_REPO_CONF /etc/yum.repos.d/CentOS-Ceph-Hammer.repo" - .. admonition:: Newton :class: newton @@ -195,14 +181,6 @@ created on the undercloud, one should use a non-root user. rhel-7-server-rhceph-2-osd-rpms rhel-7-server-rhceph-2-tools-rpms - .. admonition:: Mitaka - :class: mitaka - - :: - - 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 @@ -295,21 +273,6 @@ used:: openstack overcloud node import --introspect --provide instackenv.json -.. admonition:: Stable Branch - :class: stable - - .. admonition:: Mitaka - :class: mitaka - - For TripleO release Mitaka, the import command is:: - - openstack baremetal import --json instackenv.json - - The following command must be run after registration to assign the - deployment kernel and ramdisk to all nodes:: - - openstack baremetal configure boot - Starting with the Newton release you can take advantage of the ``enroll`` provisioning state - see :doc:`../advanced_deployment/node_states` for details. @@ -359,16 +322,6 @@ making the nodes available for deployment. openstack overcloud node introspect --all-manageable --provide -.. admonition:: Stable Branch - :class: stable - - .. admonition:: Mitaka - :class: mitaka - - For TripleO release Mitaka, the introspection command is:: - - openstack baremetal introspection bulk start - .. note:: **Introspection has to finish without errors.** The process can take up to 5 minutes for VM / 15 minutes for baremetal. If the process takes longer, see :ref:`introspection_problems`. diff --git a/doc/source/index.rst b/doc/source/index.rst index 157d5e30..14c1df64 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -82,11 +82,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:: Mitaka - :class: mitaka - - Step that should only be run when installing from the Mitaka stable branch. - .. admonition:: Newton :class: newton diff --git a/doc/source/post_deployment/build_single_image.rst b/doc/source/post_deployment/build_single_image.rst index f972c337..0718f308 100644 --- a/doc/source/post_deployment/build_single_image.rst +++ b/doc/source/post_deployment/build_single_image.rst @@ -33,16 +33,6 @@ re-configured to use it. This can be done by re-running:: openstack overcloud node configure --all-manageable -.. admonition:: Stable Branch - :class: stable - - .. admonition:: Mitaka - :class: mitaka - - For TripleO release Mitaka, the boot configuration command is:: - - openstack baremetal configure boot - .. note:: If you want to use custom images for boot configuration, specify their names in ``--deploy-kernel`` and ``--deploy-ramdisk`` options. diff --git a/doc/source/post_deployment/quiesce_cephstorage.rst b/doc/source/post_deployment/quiesce_cephstorage.rst index 9e75be91..7a7cb4e6 100644 --- a/doc/source/post_deployment/quiesce_cephstorage.rst +++ b/doc/source/post_deployment/quiesce_cephstorage.rst @@ -42,15 +42,6 @@ CRUSH map, from the OSDs map and delete the authentication keys:: ceph osd rm $OSD_ID done -.. admonition:: Mitaka - :class: mitaka - - TripleO/Mitaka uses and supports Ceph/Hammer, not Jewel, which does not - use systemd but sysv init scripts. For Mitaka the systemctl command above - which stops the OSD should be replaced by:: - - service ceph stop osd.$OSD_ID - You are now free to reboot or shut down the node (using the Ironic API), or even remove it from the overcloud altogether by scaling down the overcloud deployment, see :ref:`delete_nodes`. diff --git a/doc/source/post_deployment/upgrade.rst b/doc/source/post_deployment/upgrade.rst index 3eac43bf..5123b080 100644 --- a/doc/source/post_deployment/upgrade.rst +++ b/doc/source/post_deployment/upgrade.rst @@ -6,11 +6,6 @@ first upgrading the undercloud, and then upgrading the overcloud. Note that there are version specific caveats and notes which are pointed out as below: -.. admonition:: Liberty to Mitaka - :class: ltom - - liberty to mitaka specific note - .. admonition:: Mitaka to Newton :class: mton @@ -35,14 +30,6 @@ Upgrading the Undercloud 1. Disable the old OpenStack release repositories and enable new release repositories on the undercloud: - .. admonition:: Liberty to Mitaka - :class: ltom - - :: - - export CURRENT_VERSION=liberty - export NEW_VERSION=mitaka - .. admonition:: Mitaka to Newton :class: mton @@ -71,21 +58,6 @@ Upgrading the Undercloud 2. Run undercloud upgrade: - .. admonition:: Liberty to Mitaka - :class: ltom - - For liberty to mitaka upgrades we need to manually update - mariadb including a database backup/restore:: - - mysqldump -u root --flush-privileges --single-transaction --all-databases > /home/stack/backup.sql - sudo systemctl stop mariadb - sudo mv /var/lib/mysql /home/stack/mysql-backup - - sudo yum -y update mariadb - - sudo systemctl start mariadb - mysql -u root < /home/stack/backup.sql - .. admonition:: Mitaka to Newton :class: mton @@ -276,60 +248,6 @@ Upgrading the Overcloud to Newton and earlier `openstack stack list` and `sudo pcs status` on a controller reports everything running fine before proceeding to the next step. -.. admonition:: Liberty to Mitaka - :class: ltom - - **Create the new CephClientKey** - - If using a TripleO managed Ceph deployment, a new key for the - "client.openstack" CephX user needs to be provided. A sample - environment file would look like the following:: - - parameter_defaults: - CephClientKey: 'my_cephx_key' - - A proper value for the key parameter can be generated from any of - the overcloud nodes with:: - - $ ceph-authtool --gen-print-key - -.. admonition:: Liberty to Mitaka - :class: ltom - - - **Deliver the aodh migration.** - - For Liberty to Mitaka we need to run an extra step in the upgrades workflow - after the upgrade initialisation. - - This is to deliver the migration from ceilometer-alarms to aodh. To execute - this step run `overcloud deploy`, passing in the full set of environment - files plus `major-upgrade-aodh.yaml`. Note that the `--force-postconfig` - switch is needed in order to add the newly created aodh endpoint:: - - openstack overcloud deploy --templates \ - -e \ - -e /usr/share/openstack-tripleo-heat-templates/environments/major-upgrade-aodh.yaml \ - --force-postconfig - -.. admonition:: Liberty to Mitaka - :class: ltom - - - **Deliver the migration for keystone to run under httpd.** - - For Liberty to Mitaka we need to run an extra step in the upgrades workflow - after the aodh migration. - - This is to deliver the migration for keystone to be run under httpd (apache) - rather than eventlet as was the case before. To execute this step run - `overcloud deploy`, passing in the full set of environment files plus - `major-upgrade-keystone-liberty-mitaka.yaml`:: - - openstack overcloud deploy --templates \ - -e \ - -e /usr/share/openstack-tripleo-heat-templates/environments/major-upgrade-keystone-liberty-mitaka.yaml - .. admonition:: Mitaka to Newton :class: mton diff --git a/doc/source/post_deployment/upload_single_image.rst b/doc/source/post_deployment/upload_single_image.rst index 264bea5e..ba6ade7c 100644 --- a/doc/source/post_deployment/upload_single_image.rst +++ b/doc/source/post_deployment/upload_single_image.rst @@ -11,14 +11,4 @@ re-configured to use it. This can be done by re-running:: openstack overcloud node configure --all-manageable -.. admonition:: Stable Branch - :class: stable - - .. admonition:: Mitaka - :class: mitaka - - For TripleO release Mitaka, the boot configuration command is:: - - openstack baremetal configure boot - Now the new image should be fully ready for use by new deployments. diff --git a/doc/source/repositories.txt b/doc/source/repositories.txt index 9b8280f4..0bac84a8 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:: Mitaka - :class: mitaka ltom - - Enable latest RDO Mitaka Delorean repository for all packages - - :: - - sudo curl -L -o /etc/yum.repos.d/delorean-mitaka.repo https://trunk.rdoproject.org/centos7-mitaka/current/delorean.repo - - Enable the Mitaka Delorean Deps repository - - :: - - sudo curl -L -o /etc/yum.repos.d/delorean-deps-mitaka.repo https://trunk.rdoproject.org/centos7-mitaka/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:: Newton :class: newton mton