From 7c01efdac24bdd126b50efca78e99708f279dc7a Mon Sep 17 00:00:00 2001 From: Ruby Loo Date: Wed, 28 Sep 2016 09:57:39 -0400 Subject: [PATCH] Change links to point to new install guide This changes links that point to the old install guide, to point to the new install guide. Change-Id: I3f92664afc1332468c1863bce8dc8675c972261d --- doc/source/deploy/cleaning.rst | 4 +++- doc/source/deploy/multitenancy.rst | 6 ++++-- doc/source/deploy/upgrade-guide.rst | 6 ++++-- doc/source/drivers/cimc.rst | 4 +++- doc/source/drivers/ilo.rst | 31 ++++++++++++++++------------- doc/source/drivers/ipa.rst | 3 ++- doc/source/drivers/seamicro.rst | 4 +++- doc/source/drivers/vbox.rst | 4 +++- 8 files changed, 39 insertions(+), 23 deletions(-) diff --git a/doc/source/deploy/cleaning.rst b/doc/source/deploy/cleaning.rst index f5cf1af6fe..fc68b7fd08 100644 --- a/doc/source/deploy/cleaning.rst +++ b/doc/source/deploy/cleaning.rst @@ -189,7 +189,7 @@ If you are using the Neutron DHCP provider (the default) you will also need to ensure you have configured a cleaning network. This network will be used to boot the ramdisk for in-band cleaning. You can use the same network as your tenant network. For steps to set up the cleaning network, please see -:ref:`CleaningNetworkSetup`. +`Configure the Bare Metal service for cleaning`_. .. _InbandvsOutOfBandCleaning: @@ -328,3 +328,5 @@ to allow it to be scheduled by nova. The node will begin automated cleaning from the start, and move to ``available`` state when complete. + +.. _`Configure the Bare Metal service for cleaning`: http://docs.openstack.org/project-install-guide/baremetal/draft/configure-cleaning.html diff --git a/doc/source/deploy/multitenancy.rst b/doc/source/deploy/multitenancy.rst index 6b7b195299..464c18ba6a 100644 --- a/doc/source/deploy/multitenancy.rst +++ b/doc/source/deploy/multitenancy.rst @@ -83,8 +83,8 @@ interface as stated above): cleaning_network_uuid=$CLEAN_UUID provisioning_network_uuid=$PROVISION_UUID - Please refer to :ref:`CleaningNetworkSetup` for more information about - cleaning. + Please refer to `Configure the Bare Metal service for cleaning`_ for more + information about cleaning. .. note:: The "provisioning" and "cleaning" networks may be the same neutron @@ -224,3 +224,5 @@ Configuring nodes After these steps, the provisioning of the created node will happen in the provisioning network, and then the node will be moved to the tenant network that was requested. + +.. _`Configure the Bare Metal service for cleaning`: http://docs.openstack.org/project-install-guide/baremetal/draft/configure-cleaning.html diff --git a/doc/source/deploy/upgrade-guide.rst b/doc/source/deploy/upgrade-guide.rst index d84ab7b689..41ef7cd40d 100644 --- a/doc/source/deploy/upgrade-guide.rst +++ b/doc/source/deploy/upgrade-guide.rst @@ -118,5 +118,7 @@ information, see :ref:`automated_cleaning`. If ironic is configured with automated cleaning enabled (defaults to True) and to use Neutron as the DHCP provider (also the default), you will need to set the `cleaning_network_uuid` option in the ironic configuration file before starting -the Kilo ironic service. See :ref:`CleaningNetworkSetup` for information on -how to set up the cleaning network for ironic. +the Kilo ironic service. See `Configure the Bare Metal service for cleaning`_ +for information on how to set up the cleaning network for ironic. + +.. _`Configure the Bare Metal service for cleaning`: http://docs.openstack.org/project-install-guide/baremetal/draft/configure-cleaning.html diff --git a/doc/source/drivers/cimc.rst b/doc/source/drivers/cimc.rst index 389352a0f9..2b603a89de 100644 --- a/doc/source/drivers/cimc.rst +++ b/doc/source/drivers/cimc.rst @@ -89,4 +89,6 @@ The following sequence of commands can be used to enroll a UCS Standalone node. ironic port-create -n $NODE -a -For more information about enrolling nodes see "Enrolling a node" in the :ref:`install-guide` +For more information about enrolling nodes see `Enrolling a node`_ in the install guide. + +.. _`Enrolling a node`: http://docs.openstack.org/project-install-guide/baremetal/draft/enrollment.html#enrolling-a-node diff --git a/doc/source/drivers/ilo.rst b/doc/source/drivers/ilo.rst index 3cc103094c..5349c8cf98 100644 --- a/doc/source/drivers/ilo.rst +++ b/doc/source/drivers/ilo.rst @@ -208,11 +208,12 @@ Target Users The PXE driver passes management information in clear-text to the bare metal node. However, if swift proxy server and glance have HTTPS - endpoints (See :ref:`EnableHTTPSinSwift`, :ref:`EnableHTTPSinGlance` for more - information), the ``iscsi_ilo`` driver provides enhanced security by - exchanging management information with swift and glance endpoints over HTTPS. - The management information, deploy ramdisk and boot images for the instance - will be retrieved over encrypted management network via iLO virtual media. + endpoints (See `Enabling HTTPS in Swift`_, `Enabling HTTPS in Image + service`_ for more information), the ``iscsi_ilo`` driver provides enhanced + security by exchanging management information with swift and glance + endpoints over HTTPS. The management information, deploy ramdisk and boot + images for the instance will be retrieved over encrypted management network + via iLO virtual media. Tested Platforms ~~~~~~~~~~~~~~~~ @@ -241,10 +242,10 @@ Features * UEFI Secure Boot Support * Passing management information via secure, encrypted management network (virtual media) if swift proxy server and glance have HTTPS endpoints. See - :ref:`EnableHTTPSinSwift`, :ref:`EnableHTTPSinGlance` for more info. User - image provisioning is done using iSCSI over data network, so this driver has - the benefit of security enhancement with the same performance. It segregates - management info from data channel. + `Enabling HTTPS in Swift`_, `Enabling HTTPS in Image service`_ for more + information. User image provisioning is done using iSCSI over data network, + so this driver has the benefit of security enhancement with the same + performance. It segregates management info from data channel. * Supports both out-of-band and in-band cleaning operations. For more details, see :ref:`InbandvsOutOfBandCleaning`. * Remote Console @@ -362,11 +363,11 @@ Target Users The PXE based agent drivers pass management information in clear-text to the bare metal node. However, if swift proxy server and glance have HTTPS - endpoints (See :ref:`EnableHTTPSinSwift`, :ref:`EnableHTTPSinGlance` for more - information), the ``agent_ilo`` driver provides enhanced security by - exchanging authtoken and management information with swift and glance - endpoints over HTTPS. The management information and deploy ramdisk will be - retrieved over encrypted management network via iLO. + endpoints (See `Enabling HTTPS in Swift`_, `Enabling HTTPS in Image + service`_ for more information), the ``agent_ilo`` driver provides enhanced + security by exchanging authtoken and management information with swift and + glance endpoints over HTTPS. The management information and deploy ramdisk + will be retrieved over encrypted management network via iLO. Tested Platforms ~~~~~~~~~~~~~~~~ @@ -1517,3 +1518,5 @@ use the ``proliant-tools`` element in DIB:: disk-image-create -o proliant-agent-ramdisk ironic-agent fedora proliant-tools +.. _`Enabling HTTPS in Swift`: http://docs.openstack.org/project-install-guide/baremetal/draft/enabling-https.html#enabling-https-in-swift +.. _`Enabling HTTPS in Image service`: http://docs.openstack.org/project-install-guide/baremetal/draft/enabling-https.html#enabling-https-in-image-service diff --git a/doc/source/drivers/ipa.rst b/doc/source/drivers/ipa.rst index 1c54aae1b6..ce01f48819 100644 --- a/doc/source/drivers/ipa.rst +++ b/doc/source/drivers/ipa.rst @@ -46,7 +46,7 @@ Requirements ------------ Using IPA requires it to be present and configured on the deploy ramdisk, see -:ref:`BuildingDeployRamdisk` for details. +`Building or downloading a deploy ramdisk image`_. Using proxies for image download in agent drivers ================================================= @@ -125,3 +125,4 @@ example, the below command sets this configuration in a specific node:: ironic node-update add driver_info/deploy_forces_oob_reboot=True +.. _`Building or downloading a deploy ramdisk image`: http://docs.openstack.org/project-install-guide/baremetal/draft/deploy-ramdisk.html diff --git a/doc/source/drivers/seamicro.rst b/doc/source/drivers/seamicro.rst index 675484d450..355d661408 100644 --- a/doc/source/drivers/seamicro.rst +++ b/doc/source/drivers/seamicro.rst @@ -53,7 +53,7 @@ None. Configuring and Enabling the driver ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -1. Build or download a deploy image, see :ref:`BuildingDeployRamdisk` +1. Build or download a deploy image, see `Building or downloading a deploy ramdisk image`_. 2. Upload these images to Glance:: @@ -113,3 +113,5 @@ References ========== .. [1] Python-seamicroclient - https://pypi.python.org/pypi/python-seamicroclient .. [2] DiskImage-Builder - http://docs.openstack.org/developer/diskimage-builder/ + +.. _`Building or downloading a deploy ramdisk image`: http://docs.openstack.org/project-install-guide/baremetal/draft/deploy-ramdisk.html diff --git a/doc/source/drivers/vbox.rst b/doc/source/drivers/vbox.rst index 5350ae0ff3..0380478d44 100644 --- a/doc/source/drivers/vbox.rst +++ b/doc/source/drivers/vbox.rst @@ -91,7 +91,7 @@ Setting up development environment ``/etc/ironic/ironic.conf``, and restart Ironic conductor. * Set up flat networking on ``eth1``. For details on how to do this, see - :ref:`NeutronFlatNetworking`. + `Configure Networking to communicate with the bare metal server`_. * Enroll a VirtualBox node. The following examples use the ``pxe_vbox`` driver. @@ -117,3 +117,5 @@ Setting up development environment Ironic (during provisioning), VirtualBox will automatically pop up a dialog box asking to 'Select start-up disk'. Just press 'Cancel' to continue booting the VM. + +.. _`Configure Networking to communicate with the bare metal server`: http://docs.openstack.org/project-install-guide/baremetal/draft/configure-integration.html#configure-networking-to-communicate-with-the-bare-metal-server