Partial revert "Document ``--skip-nodes-and-networks``"
The --skip-nodes-and-networks option will be removed.
Instead the existing --baremtal-deployment option is used to
provide the capability to enable/disable "all-in-one" network+
node provisioning with overcloud deploy command.
This patch removes --skip-nodes-and-networks from docs.
This partially reverts commit 2bae5e3aaa
.
Depends-On: Idaab1f28c4d645279eff0c01b24435bf8571299b
Change-Id: Ie31f38f4c99534b1d425713509757e792869c329
This commit is contained in:
parent
952fb8eb70
commit
ceb2fbf619
|
@ -105,13 +105,6 @@ that it can run all the steps:
|
|||
Using
|
||||
-----
|
||||
|
||||
.. note:: When networks, virtual IPs and baremetal nodes are provisioned
|
||||
using the individual commands, i.e not using the *All-in-One*
|
||||
alternative with the ``overcloud deploy`` command, the argument
|
||||
``--skip-nodes-and-networks`` should be used with the
|
||||
``overcloud deploy`` command to ensure steps are not redundantly
|
||||
repeated.
|
||||
|
||||
Pre-Provision networks
|
||||
......................
|
||||
|
||||
|
|
|
@ -254,26 +254,21 @@ The steps to define your custom networks are:
|
|||
Virtual IPs and including the environment is automated.
|
||||
|
||||
#. To deploy you pass the ``custom_network_data.yaml`` file via the ``-n``
|
||||
option to the overcloud deploy.
|
||||
|
||||
Following are two example deploy commands. The first command assumes that
|
||||
networks, virtual IP addresses and baremetal nodes has been pre-provisioned
|
||||
using the individual commands. Notice that the ``--skip-nodes-and-networks``
|
||||
argument is used in the first example to ensure that these steps are not
|
||||
redundantly repeated. The second example is the *all-in-one* approach where
|
||||
the individual commands to deploy networks, virtual IP addresses and
|
||||
baremetal nodes are not used.
|
||||
option to the overcloud deploy, for example:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
openstack overcloud deploy --templates \
|
||||
--skip-nodes-and-networks \
|
||||
-n custom_network_data.yaml \
|
||||
-e baremetal-deployed-environment.yaml \
|
||||
-e networks-deployed-environment.yaml \
|
||||
-e vip-deployed-environment.yaml \
|
||||
-e custom-net-single-nic-with-vlans.yaml
|
||||
|
||||
.. note:: baremetal-deployed-environment.yaml refers to baremetal which
|
||||
**has already been** deployed as described
|
||||
:doc:`../provisioning/baremetal_provision`
|
||||
|
||||
Alternatively include the network, Virtual IPs and baremetal provisioning
|
||||
in the ``overcloud deploy`` command to do it all in one:
|
||||
|
||||
|
@ -286,9 +281,10 @@ The steps to define your custom networks are:
|
|||
--network-config \
|
||||
-e custom-net-single-nic-with-vlans.yaml
|
||||
|
||||
.. note:: Please refer to :doc:`../provisioning/baremetal_provision`
|
||||
document page for a reference on the ``baremetal_deployment.yaml``
|
||||
used in the above example.
|
||||
.. note:: ``baremetal_deployment.yaml`` refers to baremetal which **will
|
||||
be** deployed by the above command. Please refer to
|
||||
:doc:`../provisioning/baremetal_provision` for a reference on the
|
||||
``baremetal_deployment.yaml`` used in the above example.
|
||||
|
||||
|
||||
.. admonition:: Victoria and prior releases
|
||||
|
|
|
@ -928,23 +928,13 @@ type if on bare metal, so that hardware virtualization will be used.
|
|||
|
||||
To deploy with network isolation and include the network environment file, use
|
||||
the ``-e`` and ``--networks-file`` parameters with the
|
||||
``openstack overcloud deploy`` command.
|
||||
|
||||
Following are two example deploy commands. The first command assumes that
|
||||
networks, virtual IP addresses and baremetal nodes has been pre-provisioned
|
||||
using the individual commands. Notice that the ``--skip-nodes-and-networks``
|
||||
argument is used in the first example to ensure that these steps are not
|
||||
redundantly repeated. The second example is the *all-in-one* approach where the
|
||||
individual commands to deploy networks, virtual IP addresses and baremetal
|
||||
nodes are not used.
|
||||
|
||||
The following deploy commands should work for all of the subsequent examples:
|
||||
``openstack overcloud deploy`` command. The following deploy command should
|
||||
work for all of the subsequent examples:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
openstack overcloud deploy \
|
||||
--templates \
|
||||
--skip-nodes-and-networks \
|
||||
--networks-file ~/templates/custom_network_data.yaml \
|
||||
-e ~/templates/networks-deployed-environment.yaml \
|
||||
-e ~/templates/vips-deployed-environment.yaml \
|
||||
|
|
|
@ -538,7 +538,6 @@ The baremetal nodes are provisioned with the following command::
|
|||
The overcloud can then be deployed using the output from the provision command::
|
||||
|
||||
openstack overcloud deploy \
|
||||
--skip-nodes-and-networks \
|
||||
-e /usr/share/openstack-tripleo-heat-templates/environments/deployed-server-environment.yaml \
|
||||
-e ~/overcloud-networks-deployed.yaml \
|
||||
-e ~/templates/vips-deployed-environment.yaml \
|
||||
|
|
Loading…
Reference in New Issue