From a123e0dbbcfb8a5ec318848861a999e36b2f34df Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Wed, 8 Nov 2017 23:03:54 +0000 Subject: [PATCH] Document use of tripleo-repos Change-Id: I0546428f48b05bdf8391ed9d53f6e48a4996ad80 Depends-On: I0f89dd762344ab8264c1694b028e7f9e4dffb1c6 --- .../install/installation/installing.rst | 6 +- doc/source/install/repositories.txt | 104 ++++++------------ 2 files changed, 35 insertions(+), 75 deletions(-) diff --git a/doc/source/install/installation/installing.rst b/doc/source/install/installation/installing.rst index 532ae913..a016a93a 100644 --- a/doc/source/install/installation/installing.rst +++ b/doc/source/install/installation/installing.rst @@ -65,11 +65,7 @@ Installing the Undercloud .. We need to manually continue our list numbering here since the above "include" directive breaks the numbering. -3. Install the yum-plugin-priorities package so that the Delorean repository takes precedence over the main RDO repositories:: - - sudo yum -y install yum-plugin-priorities - -#. Install the TripleO CLI, which will pull in all other necessary packages as dependencies:: +3. Install the TripleO CLI, which will pull in all other necessary packages as dependencies:: sudo yum install -y python-tripleoclient diff --git a/doc/source/install/repositories.txt b/doc/source/install/repositories.txt index 0a0b8be5..f64f6fc9 100644 --- a/doc/source/install/repositories.txt +++ b/doc/source/install/repositories.txt @@ -1,3 +1,17 @@ +.. This should be changed to something more user-friendly like http://tripleo.org/tripleo-repos.rpm + +Download and install the python2-tripleo-repos RPM from +`the current RDO repository `_. +For example:: + + sudo yum install -y https://trunk.rdoproject.org/centos7/current/python2-tripleo-repos-.el7.centos.noarch.rpm + +.. note:: tripleo-repos removes any repositories that it manages before each + run. This means all repositories must be specified in a single + tripleo-repos call. As an example, the correct way to install the + current and ceph repos is to run ``tripleo-repos current ceph``, + not two separate calls. + .. admonition:: Stable Branch :class: stable @@ -7,111 +21,61 @@ .. admonition:: Newton :class: newton mton - Enable latest RDO Newton Delorean repository for all packages + Enable the current Newton repositories:: - :: - - sudo curl -L -o /etc/yum.repos.d/delorean-newton.repo https://trunk.rdoproject.org/centos7-newton/current/delorean.repo - - Enable the Newton Delorean Deps repository - - :: - - sudo curl -L -o /etc/yum.repos.d/delorean-deps-newton.repo https://trunk.rdoproject.org/centos7-newton/delorean-deps.repo + sudo tripleo-repos -b newton current .. admonition:: Ceph :class: ceph - Enable the CentOS Storage SIG Ceph/Jewel repository if using Ceph + Include the Ceph repo in the tripleo-repos call:: - :: - - 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 + sudo tripleo-repos -b newton current ceph .. admonition:: Ocata :class: ocata ntoo - Enable latest RDO Ocata Delorean repository for all packages + Enable the current Ocata repositories:: - :: - - sudo curl -L -o /etc/yum.repos.d/delorean-ocata.repo https://trunk.rdoproject.org/centos7-ocata/current/delorean.repo - - Enable the Ocata Delorean Deps repository - - :: - - sudo curl -L -o /etc/yum.repos.d/delorean-deps-ocata.repo https://trunk.rdoproject.org/centos7-ocata/delorean-deps.repo + sudo tripleo-repos -b ocata current .. admonition:: Ceph :class: ceph - Enable the CentOS Storage SIG Ceph/Jewel repository if using Ceph + Include the Ceph repo in the tripleo-repos call:: - :: - - 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 + sudo tripleo-repos -b ocata current ceph .. admonition:: Pike :class: pike otop - Enable latest RDO Pike Delorean repository for all packages + Enable the current Pike repositories:: - :: - - sudo curl -L -o /etc/yum.repos.d/delorean-pike.repo https://trunk.rdoproject.org/centos7-pike/current/delorean.repo - - Enable the Pike Delorean Deps repository - - :: - - sudo curl -L -o /etc/yum.repos.d/delorean-deps-pike.repo https://trunk.rdoproject.org/centos7-pike/delorean-deps.repo + sudo tripleo-repos -b pike current .. admonition:: Ceph :class: ceph - Enable the CentOS Storage SIG Ceph/Jewel repository if using Ceph + Include the Ceph repo in the tripleo-repos call:: - :: - - 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 + sudo tripleo-repos -b pike current ceph .. warning:: The remaining repositories configuration steps below should not be done for stable releases! -Enable last known good RDO Trunk Delorean repository for core openstack packages - +Run tripleo-repos to install the appropriate repositories. The option below +will enable the latest master TripleO packages and the latest promoted +packages for all other OpenStack services and dependencies. There are other +repository configurations available in tripleo-repos, see its --help output +for details. :: - sudo curl -L -o /etc/yum.repos.d/delorean.repo https://trunk.rdoproject.org/centos7-master/current-tripleo/delorean.repo - -Enable latest RDO Trunk Delorean repository only for the |project| packages - -:: - - sudo curl -L -o /etc/yum.repos.d/delorean-current.repo https://trunk.rdoproject.org/centos7/current/delorean.repo - sudo sed -i 's/\[delorean\]/\[delorean-current\]/' /etc/yum.repos.d/delorean-current.repo - sudo /bin/bash -c "cat <>/etc/yum.repos.d/delorean-current.repo - - includepkgs=diskimage-builder,instack,instack-undercloud,os-apply-config,os-collect-config,os-net-config,os-refresh-config,python-tripleoclient,openstack-tripleo-*,puppet-* - EOF" - -Enable the Delorean Deps repository - -:: - - sudo curl -L -o /etc/yum.repos.d/delorean-deps.repo https://trunk.rdoproject.org/centos7/delorean-deps.repo + sudo tripleo-repos current-tripleo-dev .. admonition:: Ceph :class: ceph - Enable the CentOS Storage SIG Ceph/Jewel repository if using Ceph + Include the Ceph repository in the tripleo-repos command:: - :: - - 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 + sudo tripleo-repos current-tripleo-dev ceph