From f2de4983eda5f9a16b59553e0d7816a7f235ed5b Mon Sep 17 00:00:00 2001
From: Dan Sneddon <dsneddon@redhat.com>
Date: Tue, 14 Mar 2017 15:58:25 -0700
Subject: [PATCH] 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
---
 doc/source/_custom/custom.css                 |  2 ++
 .../basic_deployment/basic_deployment_cli.rst | 14 +++++++++++
 doc/source/index.rst                          |  5 ++++
 doc/source/repositories.txt                   | 25 +++++++++++++++++++
 4 files changed, 46 insertions(+)

diff --git a/doc/source/_custom/custom.css b/doc/source/_custom/custom.css
index 74a6901a..555096c7 100644
--- a/doc/source/_custom/custom.css
+++ b/doc/source/_custom/custom.css
@@ -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;
diff --git a/doc/source/basic_deployment/basic_deployment_cli.rst b/doc/source/basic_deployment/basic_deployment_cli.rst
index 1b61b985..c4057c4c 100644
--- a/doc/source/basic_deployment/basic_deployment_cli.rst
+++ b/doc/source/basic_deployment/basic_deployment_cli.rst
@@ -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:
 
diff --git a/doc/source/index.rst b/doc/source/index.rst
index da1e8bd3..d99a465c 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -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
 
diff --git a/doc/source/repositories.txt b/doc/source/repositories.txt
index 50f75089..0554f295 100644
--- a/doc/source/repositories.txt
+++ b/doc/source/repositories.txt
@@ -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