Merge "docs: installation: remove unnecessary blockquotes"
This commit is contained in:
Jenkins
Gerrit Code Review
commit
38f960c805
@ -94,7 +94,7 @@ created on the undercloud, one should use a non-root user.
|
||||
|
||||
#. Install the ``current-tripleo`` delorean repository and deps repository:
|
||||
|
||||
.. include:: ../repositories.txt
|
||||
.. include:: ../repositories.txt
|
||||
|
||||
|
||||
3. Export environment variables
|
||||
|
||||
@ -48,15 +48,15 @@ Installing the Undercloud
|
||||
|
||||
#. Enable needed repositories:
|
||||
|
||||
.. admonition:: RHEL
|
||||
:class: rhel
|
||||
.. admonition:: RHEL
|
||||
:class: rhel
|
||||
|
||||
Enable optional repo::
|
||||
Enable optional repo::
|
||||
|
||||
sudo yum install -y yum-utils
|
||||
sudo yum-config-manager --enable rhelosp-rhel-7-server-opt
|
||||
sudo yum install -y yum-utils
|
||||
sudo yum-config-manager --enable rhelosp-rhel-7-server-opt
|
||||
|
||||
.. include:: ../repositories.txt
|
||||
.. include:: ../repositories.txt
|
||||
|
||||
.. We need to manually continue our list numbering here since the above
|
||||
"include" directive breaks the numbering.
|
||||
@ -80,45 +80,46 @@ Installing the Undercloud
|
||||
|
||||
cp /usr/share/instack-undercloud/undercloud.conf.sample ~/undercloud.conf
|
||||
|
||||
.. TODO(bnemec): Find a more permanent location for this tool.
|
||||
.. note:: There is a tool available that can help with writing a basic
|
||||
undercloud.conf:
|
||||
`Undercloud Configuration Wizard <http://ucw-bnemec.rhcloud.com/>`_
|
||||
It takes some basic information about the intended overcloud
|
||||
environment and generates sane values for a number of the important
|
||||
options.
|
||||
.. TODO(bnemec): Find a more permanent location for this tool.
|
||||
|
||||
.. note:: There is a tool available that can help with writing a basic
|
||||
undercloud.conf:
|
||||
`Undercloud Configuration Wizard <http://ucw-bnemec.rhcloud.com/>`_
|
||||
It takes some basic information about the intended overcloud
|
||||
environment and generates sane values for a number of the important
|
||||
options.
|
||||
|
||||
#. Run the command to install the undercloud:
|
||||
|
||||
.. admonition:: Source
|
||||
:class: source
|
||||
.. admonition:: Source
|
||||
:class: source
|
||||
|
||||
Git checkouts of the puppet modules can be used instead of packages. Export the
|
||||
following environment variable::
|
||||
Git checkouts of the puppet modules can be used instead of packages. Export the
|
||||
following environment variable::
|
||||
|
||||
export DIB_INSTALLTYPE_puppet_modules=source
|
||||
export DIB_INSTALLTYPE_puppet_modules=source
|
||||
|
||||
It is also possible to use this functionality to use an in-progress review
|
||||
as part of the undercloud install. See
|
||||
:doc:`../developer/in_progress_review` for details.
|
||||
It is also possible to use this functionality to use an in-progress review
|
||||
as part of the undercloud install. See
|
||||
:doc:`../developer/in_progress_review` for details.
|
||||
|
||||
.. admonition:: SSL
|
||||
:class: optional
|
||||
.. admonition:: SSL
|
||||
:class: optional
|
||||
|
||||
To deploy an undercloud with SSL, see :doc:`../advanced_deployment/ssl`.
|
||||
To deploy an undercloud with SSL, see :doc:`../advanced_deployment/ssl`.
|
||||
|
||||
.. admonition:: Validations
|
||||
:class: validations
|
||||
.. admonition:: Validations
|
||||
:class: validations
|
||||
|
||||
:doc:`../validations/validations` will be installed and
|
||||
configured during undercloud installation. You can set
|
||||
``enable_validations = false`` in ``undercloud.conf`` to prevent
|
||||
that.
|
||||
:doc:`../validations/validations` will be installed and
|
||||
configured during undercloud installation. You can set
|
||||
``enable_validations = false`` in ``undercloud.conf`` to prevent
|
||||
that.
|
||||
|
||||
|
||||
Install the undercloud::
|
||||
Install the undercloud::
|
||||
|
||||
openstack undercloud install
|
||||
openstack undercloud install
|
||||
|
||||
|
||||
Once the install has completed, you should take note of the files ``stackrc`` and
|
||||
|
||||
@ -9,7 +9,7 @@ You can upgrade any packages that are installed on the undercloud machine.
|
||||
|
||||
#. Enable new Delorean repositories:
|
||||
|
||||
.. include:: ../repositories.txt
|
||||
.. include:: ../repositories.txt
|
||||
|
||||
.. We need to manually continue our list numbering here since the above
|
||||
"include" directive breaks the numbering.
|
||||
@ -25,14 +25,14 @@ You can upgrade any packages that are installed on the undercloud machine.
|
||||
.. admonition:: Stable Branch
|
||||
:class: stable
|
||||
|
||||
Stop services so that they are not restarted by packaging scripts
|
||||
when they are updated. The service restarts will be handled by the
|
||||
undercloud upgrade command after new configuration has been applied.::
|
||||
Stop services so that they are not restarted by packaging scripts
|
||||
when they are updated. The service restarts will be handled by the
|
||||
undercloud upgrade command after new configuration has been applied.::
|
||||
|
||||
sudo systemctl stop openstack-*
|
||||
sudo systemctl stop neutron-*
|
||||
sudo systemctl stop openvswitch
|
||||
sudo systemctl stop httpd
|
||||
sudo systemctl stop openstack-*
|
||||
sudo systemctl stop neutron-*
|
||||
sudo systemctl stop openvswitch
|
||||
sudo systemctl stop httpd
|
||||
|
||||
#. Update the TripleO CLI package::
|
||||
|
||||
|
||||
@ -54,7 +54,7 @@ Upgrading the Undercloud
|
||||
|
||||
Get and enable new repos for `NEW_VERSION`:
|
||||
|
||||
.. include:: ../repositories.txt
|
||||
.. include:: ../repositories.txt
|
||||
|
||||
2. Run undercloud upgrade:
|
||||
|
||||
|
||||
@ -1,89 +1,89 @@
|
||||
.. admonition:: Stable Branch
|
||||
:class: stable
|
||||
.. admonition:: Stable Branch
|
||||
:class: stable
|
||||
|
||||
Enable the appropriate repos for the desired release, as indicated below.
|
||||
Do not enable any other repos not explicitly marked for that release.
|
||||
Enable the appropriate repos for the desired release, as indicated below.
|
||||
Do not enable any other repos not explicitly marked for that release.
|
||||
|
||||
.. admonition:: Newton
|
||||
:class: newton mton
|
||||
.. admonition:: Newton
|
||||
:class: newton mton
|
||||
|
||||
Enable latest RDO Newton Delorean repository for all packages
|
||||
Enable latest RDO Newton Delorean repository for all packages
|
||||
|
||||
::
|
||||
::
|
||||
|
||||
sudo curl -L -o /etc/yum.repos.d/delorean-newton.repo https://trunk.rdoproject.org/centos7-newton/current/delorean.repo
|
||||
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
|
||||
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 curl -L -o /etc/yum.repos.d/delorean-deps-newton.repo https://trunk.rdoproject.org/centos7-newton/delorean-deps.repo
|
||||
|
||||
.. admonition:: Ceph
|
||||
:class: ceph
|
||||
.. admonition:: Ceph
|
||||
:class: ceph
|
||||
|
||||
Enable the CentOS Storage SIG Ceph/Jewel repository if using Ceph
|
||||
Enable the CentOS Storage SIG Ceph/Jewel repository if using Ceph
|
||||
|
||||
::
|
||||
::
|
||||
|
||||
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 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
|
||||
|
||||
.. admonition:: Ocata
|
||||
:class: ocata ntoo
|
||||
.. admonition:: Ocata
|
||||
:class: ocata ntoo
|
||||
|
||||
Enable latest RDO Ocata Delorean repository for all packages
|
||||
Enable latest RDO Ocata Delorean repository for all packages
|
||||
|
||||
::
|
||||
::
|
||||
|
||||
sudo curl -L -o /etc/yum.repos.d/delorean-ocata.repo https://trunk.rdoproject.org/centos7-ocata/current/delorean.repo
|
||||
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
|
||||
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 curl -L -o /etc/yum.repos.d/delorean-deps-ocata.repo https://trunk.rdoproject.org/centos7-ocata/delorean-deps.repo
|
||||
|
||||
.. admonition:: Ceph
|
||||
:class: ceph
|
||||
.. admonition:: Ceph
|
||||
:class: ceph
|
||||
|
||||
Enable the CentOS Storage SIG Ceph/Jewel repository if using Ceph
|
||||
Enable the CentOS Storage SIG Ceph/Jewel repository if using Ceph
|
||||
|
||||
::
|
||||
::
|
||||
|
||||
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 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
|
||||
|
||||
|
||||
Enable last known good RDO Trunk Delorean repository for core openstack packages
|
||||
Enable last known good RDO Trunk Delorean repository for core openstack packages
|
||||
|
||||
::
|
||||
::
|
||||
|
||||
sudo curl -L -o /etc/yum.repos.d/delorean.repo https://trunk.rdoproject.org/centos7-master/current-tripleo/delorean.repo
|
||||
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
|
||||
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 <<EOF>>/etc/yum.repos.d/delorean-current.repo
|
||||
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 <<EOF>>/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-*,openstack-puppet-modules,puppet-*
|
||||
EOF"
|
||||
includepkgs=diskimage-builder,instack,instack-undercloud,os-apply-config,os-collect-config,os-net-config,os-refresh-config,python-tripleoclient,openstack-tripleo-*,openstack-puppet-modules,puppet-*
|
||||
EOF"
|
||||
|
||||
Enable the Delorean Deps repository
|
||||
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 curl -L -o /etc/yum.repos.d/delorean-deps.repo https://trunk.rdoproject.org/centos7/delorean-deps.repo
|
||||
|
||||
.. admonition:: Ceph
|
||||
:class: ceph
|
||||
.. admonition:: Ceph
|
||||
:class: ceph
|
||||
|
||||
Enable the CentOS Storage SIG Ceph/Jewel repository if using Ceph
|
||||
Enable the CentOS Storage SIG Ceph/Jewel repository if using Ceph
|
||||
|
||||
::
|
||||
::
|
||||
|
||||
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 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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user