Document Ceph repositories to be enabled

Adds informations on which additional repositories need to be
enabled to deploy with support for Ceph.

Change-Id: I078020a35e86faf359ae096ab46b522afdede81e
This commit is contained in:
Giulio Fidente 2016-08-09 15:30:19 +02:00
parent a18f0490c2
commit 86e3850e0b
3 changed files with 72 additions and 14 deletions

View File

@ -86,21 +86,40 @@ non-root user that was used to install the undercloud.
export USE_DELOREAN_TRUNK=1
export DELOREAN_TRUNK_REPO="http://buildlogs.centos.org/centos/7/cloud/x86_64/rdo-trunk-master-tripleo/"
export DELOREAN_REPO_FILE="delorean.repo"
export DIB_YUM_REPO_CONF=/etc/yum.repos.d/delorean*
.. admonition:: Liberty
:class: liberty
.. admonition:: Ceph
:class: ceph
::
export DELOREAN_TRUNK_REPO="http://trunk.rdoproject.org/centos7-liberty/current/"
export DIB_YUM_REPO_CONF="$DIB_YUM_REPO_CONF /etc/yum.repos.d/CentOS-Ceph-Jewel.repo"
.. admonition:: Mitaka
:class: mitaka
.. admonition:: Stable Branch
:class: stable
::
.. admonition:: Liberty
:class: liberty
export DELOREAN_TRUNK_REPO="http://trunk.rdoproject.org/centos7-mitaka/current/"
::
export DELOREAN_TRUNK_REPO="http://trunk.rdoproject.org/centos7-liberty/current/"
export DIB_YUM_REPO_CONF=/etc/yum.repos.d/delorean*
.. admonition:: Mitaka
:class: mitaka
::
export DELOREAN_TRUNK_REPO="http://trunk.rdoproject.org/centos7-mitaka/current/"
export DIB_YUM_REPO_CONF=/etc/yum.repos.d/delorean*
.. admonition:: Ceph
:class: ceph
::
export DIB_YUM_REPO_CONF="$DIB_YUM_REPO_CONF /etc/yum.repos.d/CentOS-Ceph-Hammer.repo"
#. Build the required images:
@ -129,6 +148,28 @@ non-root user that was used to install the undercloud.
export REG_REPOS="rhel-7-server-rpms rhel-7-server-extras-rpms rhel-ha-for-rhel-7-server-rpms \
rhel-7-server-optional-rpms rhel-7-server-openstack-6.0-rpms"
.. admonition:: Ceph
:class: ceph
If using Ceph, additional channels need to be added to `REG_REPOS`.
Enable the appropriate channels for the desired release, as indicated below.
Do not enable any other channels not explicitly marked for that release.
::
rhel-7-server-rhceph-2-mon-rpms
rhel-7-server-rhceph-2-osd-rpms
rhel-7-server-rhceph-2-tools-rpms
.. admonition:: Stable branch
:class: stable
::
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
@ -147,6 +188,9 @@ non-root user that was used to install the undercloud.
# rhel-7-server-optional-rpms
# rhel-7-server-extras-rpms
# rhel-7-server-openstack-6.0-rpms
# rhel-7-server-rhceph-{2,1.3}-mon-rpms
# rhel-7-server-rhceph-{2,1.3}-osd-rpms
# rhel-7-server-rhceph-{2,1.3}-tools-rpms
export REG_ACTIVATION_KEY="[activation key]"
.. admonition:: Source
@ -293,11 +337,6 @@ configured for the virtual environment. To customize this, see the output of::
--ceph-storage-scale <number of nodes> -e /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml
By default when Ceph is enabled the Cinder LVM back-end is disabled. This
behavior may be changed passing::
--cinder-lvm
.. admonition:: RHEL Satellite Registration
:class: satellite

View File

@ -78,7 +78,6 @@ Preparing the Virtual Environment (Automated)
rhel-7-server-extras-rpms
rhel-7-server-openstack-6.0-rpms
See the `Red Hat Satellite User Guide`_ for how to configure the system to
register with a Satellite server. It is suggested to use an activation
key that automatically enables the above repos for registered systems.

View File

@ -34,6 +34,15 @@
sudo curl -L -o /etc/yum.repos.d/delorean-deps-mitaka.repo http://trunk.rdoproject.org/centos7-mitaka/delorean-deps.repo
.. admonition:: Ceph
:class: ceph
Enable the CentOS Storage SIG Ceph/Hammer repository if deploying Ceph (managed or external)
::
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
Enable last known good RDO Trunk Delorean repository for core openstack packages
@ -52,9 +61,20 @@
includepkgs=diskimage-builder,instack,instack-undercloud,os-apply-config,os-cloud-config,os-collect-config,os-net-config,os-refresh-config,python-tripleoclient,openstack-tripleo-common,openstack-tripleo-heat-templates,openstack-tripleo-image-elements,openstack-tripleo,openstack-tripleo-puppet-elements,openstack-puppet-modules,puppet-*
EOF"
Enable the Delorean Deps repository
::
sudo curl -L -o /etc/yum.repos.d/delorean-deps.repo http://trunk.rdoproject.org/centos7/delorean-deps.repo
.. admonition:: Ceph
:class: ceph
Enable the CentOS Storage SIG Ceph/Jewel repository if deploying Ceph (managed or external)
::
sudo yum-config-manager --add-repo https://raw.githubusercontent.com/CentOS-Storage-SIG/centos-release-ceph-jewel/master/CentOS-Ceph-Jewel.repo
sudo yum-config-manager --disable centos-ceph-jewel
sudo yum-config-manager --enable centos-ceph-jewel-test
sudo sed -i -e 's%gpgcheck=.*%gpgcheck=0%' /etc/yum.repos.d/CentOS-Ceph-Jewel.repo