From 64078a64a1388b0481340da0572469d1181df257 Mon Sep 17 00:00:00 2001 From: John Trowbridge Date: Wed, 7 Oct 2015 14:37:07 -0400 Subject: [PATCH] Clean up the basic install instructions Moved everything not related to the delorean repos out of repositories.txt so that it can be reused for the update page. Changed refrences to discovery image to ironic-python-agent image. Fixed missing DIB_YUM_REPO_CONF export. The ironic-python-agent ramdisk can not build without this. Change-Id: I054dedd7749eac093b24ac1e3e4f4e47fdb41fe2 --- .../basic_deployment/basic_deployment_cli.rst | 20 +++++++++---------- doc/source/installation/installing.rst | 12 +++++++++-- doc/source/installation/updating.rst | 14 ++++++++----- doc/source/repositories.txt | 20 +++---------------- 4 files changed, 31 insertions(+), 35 deletions(-) diff --git a/doc/source/basic_deployment/basic_deployment_cli.rst b/doc/source/basic_deployment/basic_deployment_cli.rst index 266b1cf5..484552c7 100644 --- a/doc/source/basic_deployment/basic_deployment_cli.rst +++ b/doc/source/basic_deployment/basic_deployment_cli.rst @@ -42,13 +42,13 @@ Get Images deploy-ramdisk-ironic.initramfs deploy-ramdisk-ironic.kernel - discovery-ramdisk.initramfs - discovery-ramdisk.kernel + ironic-python-agent.initramfs + ironic-python-agent.kernel overcloud-full.initrd overcloud-full.qcow2 overcloud-full.vmlinuz -Images must be built prior to doing a deployment. A discovery ramdisk, +Images must be built prior to doing a deployment. An IPA ramdisk, deployment ramdisk, and openstack-full image can all be built using instack-undercloud. @@ -79,6 +79,11 @@ non-root user that was used to install the undercloud. export NODE_DIST=rhel7 +#. Use undercloud delorean repos to build the overcloud images: + + :: + + export DIB_YUM_REPO_CONF="/etc/yum.repos.d/delorean.repo /etc/yum.repos.d/delorean-deps.repo" #. Build the required images: @@ -127,13 +132,6 @@ non-root user that was used to install the undercloud. # rhel-7-server-openstack-6.0-rpms export REG_ACTIVATION_KEY="[activation key]" - .. note :: - By default, images are built with the latest delorean repository which has passed CI. If you need to manually test packages before CI has passed, you can use: - - :: - - export DELOREAN_TRUNK_MGT_REPO="http://trunk.rdoproject.org/centos7/current/" - .. admonition:: Source :class: source @@ -150,7 +148,7 @@ non-root user that was used to install the undercloud. .. note:: This script will build **overcloud-full** images (\*.qcow2, \*.initrd, \*.vmlinuz), **deploy-ramdisk-ironic** images (\*.initramfs, \*.kernel), - **discovery-ramdisk** images (\*.initramfs, \*.kernel) and **testing** + **ironic-python-agent** images (\*.initramfs, \*.kernel) and **testing** fedora-user.qcow2 (which is always Fedora based). diff --git a/doc/source/installation/installing.rst b/doc/source/installation/installing.rst index ad10d679..aee2a95d 100644 --- a/doc/source/installation/installing.rst +++ b/doc/source/installation/installing.rst @@ -52,12 +52,20 @@ Installing the Undercloud sudo yum install -y yum-utils sudo yum-config-manager --enable rhelosp-rhel-7-server-opt -.. include:: ../repositories.txt + Enable epel:: + sudo yum -y install epel-release + +.. include:: ../repositories.txt .. We need to manually continue our list numbering here since the above "include" directive breaks the numbering. -3. Install the TripleO CLI, which will pull in all other necessary packages as dependencies:: + +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:: sudo yum install -y python-tripleoclient diff --git a/doc/source/installation/updating.rst b/doc/source/installation/updating.rst index a892156b..83ed4a46 100644 --- a/doc/source/installation/updating.rst +++ b/doc/source/installation/updating.rst @@ -3,14 +3,18 @@ Updating Undercloud Components You can upgrade any packages that are installed on the undercloud machine. -#. Update the Delorean Trunk repository:: +#. Remove all Delorean repositories:: + sudo rm /etc/yum.repos.d/delorean* - # Remove old and enable new Delorean Trunk repository - sudo rm /etc/yum.repos.d/delorean.repo - sudo curl -o /etc/yum.repos.d/delorean.repo http://trunk.rdoproject.org/centos7/current-passed-ci/delorean.repo +#. Enable new Delorean repositories: -#. Use yum to update all installed packages:: +.. include:: ../repositories.txt + +.. We need to manually continue our list numbering here since the above + "include" directive breaks the numbering. + +3. Use yum to update all installed packages:: sudo yum update -y diff --git a/doc/source/repositories.txt b/doc/source/repositories.txt index 215c6455..0a22a355 100644 --- a/doc/source/repositories.txt +++ b/doc/source/repositories.txt @@ -1,19 +1,13 @@ - Enable epel - - :: - - sudo yum -y install epel-release - - - Enable last known good RDO Trunk Delorean repository + Enable last known good RDO Trunk Delorean repository for core openstack packages :: sudo curl -o /etc/yum.repos.d/delorean.repo http://trunk.rdoproject.org/centos7/current-tripleo/delorean.repo + Enable latest RDO Trunk Delorean repository only for the |project| packages + :: - # Enable latest RDO Trunk Delorean repository sudo curl -o /etc/yum.repos.d/delorean-current.repo http://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 @@ -27,11 +21,3 @@ :: sudo curl -o /etc/yum.repos.d/delorean-deps.repo http://trunk.rdoproject.org/centos7/delorean-deps.repo - - 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 -