Update installation instructions to include stable/ocata branch

This change updates the undercloud installation and overcloud
basic command line installation instructions to include repos
for the stable branch of Ocata.

It appears that all the required information for upgrading from
Newton to Ocata already appears in the post_deployment/upgrading
document, but this should probably be reviewed.

Change-Id: I7843c45ec860dcda43fe57433c04a8d0cc24b021
This commit is contained in:
Dan Sneddon 2017-03-14 15:58:25 -07:00
parent 2e5a88fa2e
commit f2de4983ed
4 changed files with 46 additions and 0 deletions

View File

@ -64,6 +64,7 @@
.stable {background: #eed;}
.mitaka {background: #dee;}
.newton {background: #ede;}
.ocata {background: #edd;}
.centos {background: #fef;}
.baremetal {background: #eef;}
.virtual {background: #efe;}
@ -74,6 +75,7 @@
.ltom {background: #dee;}
.mton {background: #ded;}
.ntoo {background: #edd;}
.otoo.{background: #dde;}
/* admonition selector */
#admonition_selector {
color: white;

View File

@ -137,6 +137,20 @@ created on the undercloud, one should use a non-root user.
export DIB_YUM_REPO_CONF="$DIB_YUM_REPO_CONF /etc/yum.repos.d/CentOS-Ceph-Jewel.repo"
.. admonition:: Ocata
:class: ocata
::
STABLE_RELEASE="ocata"
.. admonition:: Ceph
:class: ceph
::
export DIB_YUM_REPO_CONF="$DIB_YUM_REPO_CONF /etc/yum.repos.d/CentOS-Ceph-Jewel.repo"
#. Build the required images:

View File

@ -89,6 +89,11 @@ Linux (RHEL). These steps are marked as follows:
Step that should only be run when installing from the Newton stable branch.
.. admonition:: Ocata
:class: ocata
Step that should only be run when installing from the Ocata stable branch.
.. admonition:: SSL
:class: ssl

View File

@ -54,6 +54,31 @@
sudo yum -y install --enablerepo=extras centos-release-ceph-jewel
sudo sed -i -e 's%gpgcheck=.*%gpgcheck=0%' /etc/yum.repos.d/CentOS-Ceph-Jewel.repo
.. admonition:: Ocata
:class: ocata ntoo
Enable latest RDO Ocata Delorean repository for all packages
::
sudo curl -L -o /etc/yum.repos.d/delorean-ocata.repo https://trunk.rdoproject.org/centos7-oacata/current/delorean.repo
Enable the Ocata Delorean Deps repository
::
sudo curl -L -o /etc/yum.repos.d/delorean-deps-ocata.repo http://trunk.rdoproject.org/centos7-ocata/delorean-deps.repo
.. admonition:: Ceph
:class: ceph
Enable the CentOS Storage SIG Ceph/Jewel repository if using Ceph
::
sudo yum -y install --enablerepo=extras centos-release-ceph-jewel
sudo sed -i -e 's%gpgcheck=.*%gpgcheck=0%' /etc/yum.repos.d/CentOS-Ceph-Jewel.repo
Enable last known good RDO Trunk Delorean repository for core openstack packages