From 0150168b6bd4a1b131502ec555a7e605542b8051 Mon Sep 17 00:00:00 2001 From: James Slagle Date: Tue, 26 May 2015 10:38:36 -0400 Subject: [PATCH] Document OSP-7 for the internal docs Adds steps on how to use OSP-7 to the internal docs. Change-Id: Ia85066a785be10627d2af8c6864f3b689f8f6afc --- doc/source/basic_deployment/basic_deployment.rst | 6 ++++-- doc/source/environments/virtual.rst | 15 ++++++++++++--- doc/source/installation/installing.rst | 14 ++++++++++++-- 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/doc/source/basic_deployment/basic_deployment.rst b/doc/source/basic_deployment/basic_deployment.rst index 1f88f627a..19c10782f 100644 --- a/doc/source/basic_deployment/basic_deployment.rst +++ b/doc/source/basic_deployment/basic_deployment.rst @@ -73,8 +73,10 @@ non-root user that was used to install the undercloud. curl -O http://download.devel.redhat.com/brewroot/packages/rhel-guest-image/7.1/20150203.1/images/rhel-guest-image-7.1-20150203.1.x86_64.qcow2 export DIB_LOCAL_IMAGE=rhel-guest-image-7.1-20150203.1.x86_64.qcow2 - # Enable rhos-release - export RUN_RHOS_RELEASE=1 + # Enable RHOS + export USE_DELOREAN_TRUNK=0 + export RHOS=1 + export DIB_YUM_REPO_CONF="/etc/yum.repos.d/rhos-release-7-director-rhel-7.1.repo /etc/yum.repos.d/rhos-release-7-rhel-7.1.repo" .. only:: external diff --git a/doc/source/environments/virtual.rst b/doc/source/environments/virtual.rst index 38cc90a1f..87bc8f09d 100644 --- a/doc/source/environments/virtual.rst +++ b/doc/source/environments/virtual.rst @@ -117,13 +117,22 @@ Preparing the Virtual Environment (Automated) Enable rhos-release:: - sudo yum install -y http://rhos-release.virt.bos.redhat.com/repos/rhos-release/rhos-release-latest.noarch.rpm - sudo rhos-release 6 + sudo rpm -ivh http://rhos-release.virt.bos.redhat.com/repos/rhos-release/rhos-release-latest.noarch.rpm + + # Enable either poodles or puddles: + # To enable poodles: + sudo rhos-release 7-director -d + # To enable puddles: + sudo rhos-release 7-director # We need openwsman-python from the optional repo sudo yum install -y yum-utils sudo yum-config-manager --enable rhelosp-rhel-7-server-opt + .. note:: + If testing only RHOS as opposed to RDO, all the needed repositories are + now enabled. Skip the step to enable RDO, epel, and RDO-Manager below. + :: # Enable extra packages @@ -177,7 +186,7 @@ Preparing the Virtual Environment (Automated) curl -O http://download.devel.redhat.com/brewroot/packages/rhel-guest-image/7.1/20150203.1/images/rhel-guest-image-7.1-20150203.1.x86_64.qcow2 export DIB_LOCAL_IMAGE=rhel-guest-image-7.1-20150203.1.x86_64.qcow2 - export DIB_YUM_REPO_CONF=/etc/yum.repos.d/rhos-release-6-rhel-7.1.repo + export DIB_YUM_REPO_CONF="/etc/yum.repos.d/rhos-release-7-director-rhel-7.1.repo /etc/yum.repos.d/rhos-release-7-rhel-7.1.repo" .. only:: external diff --git a/doc/source/installation/installing.rst b/doc/source/installation/installing.rst index 37178dfe4..1acc313e9 100644 --- a/doc/source/installation/installing.rst +++ b/doc/source/installation/installing.rst @@ -45,13 +45,23 @@ Installing the Undercloud Enable rhos-release:: - sudo yum install -y http://rhos-release.virt.bos.redhat.com/repos/rhos-release/rhos-release-latest.noarch.rpm - sudo rhos-release 6 + sudo rpm -ivh http://rhos-release.virt.bos.redhat.com/repos/rhos-release/rhos-release-latest.noarch.rpm + + # Enable either poodles or puddles: + # To enable poodles: + sudo rhos-release 7-director -d + # To enable puddles: + sudo rhos-release 7-director + # We need openwsman-python from the optional repo sudo yum install -y yum-utils sudo yum-config-manager --enable rhelosp-rhel-7-server-opt + .. note:: + If testing only RHOS as opposed to RDO, all the needed repositories are + now enabled. Skip the step to enable RDO and RDO-Manager below. + :: # Enable RDO Kilo