openstack/instack-undercloud
Code Issues Proposed changes

Merge "Document OSP-7 for the internal docs"

Browse Source
This commit is contained in:
Ben Nemec 2015-05-26 22:44:29 +02:00 committed by Gerrit Code Review
commit 7e51106c52
3 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/source/basic_deployment/basic_deployment.rst
View File

@ -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 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_LOCAL_IMAGE=rhel-guest-image-7.1-20150203.1.x86_64.qcow2
# Enable rhos-release # Enable RHOS
export RUN_RHOS_RELEASE=1 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 .. only:: external

15
doc/source/environments/virtual.rst
View File

@ -117,13 +117,22 @@ Preparing the Virtual Environment (Automated)
Enable rhos-release:: Enable rhos-release::
sudo yum install -y http://rhos-release.virt.bos.redhat.com/repos/rhos-release/rhos-release-latest.noarch.rpm sudo rpm -ivh http://rhos-release.virt.bos.redhat.com/repos/rhos-release/rhos-release-latest.noarch.rpm
sudo rhos-release 6
# 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 # We need openwsman-python from the optional repo
sudo yum install -y yum-utils sudo yum install -y yum-utils
sudo yum-config-manager --enable rhelosp-rhel-7-server-opt 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 # 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 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_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 .. only:: external

14
doc/source/installation/installing.rst
View File

@ -45,13 +45,23 @@ Installing the Undercloud
Enable rhos-release:: Enable rhos-release::
sudo yum install -y http://rhos-release.virt.bos.redhat.com/repos/rhos-release/rhos-release-latest.noarch.rpm sudo rpm -ivh http://rhos-release.virt.bos.redhat.com/repos/rhos-release/rhos-release-latest.noarch.rpm
sudo rhos-release 6
# 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 # We need openwsman-python from the optional repo
sudo yum install -y yum-utils sudo yum install -y yum-utils
sudo yum-config-manager --enable rhelosp-rhel-7-server-opt 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 # Enable RDO Kilo