Document ``--skip-nodes-and-networks``

When not using the *all-in-one* aproach, i.e manually
provisioning networks, virtual IPs and baremetal nodes
using the individual commands. The ``--skip-nodes-and-networks``
argument should be used with the ``overcloud deploy``
command so that the steps are not redundantly repeated
since the ``overcloud deploy`` command defaults to the
*all-in-one* approach.

Change-Id: I488a1285c9616d016aa4a65fa67b333875100b66

deploy-guide/source/deployment/network_v2.rst

@@ -99,6 +99,13 @@ 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
 ......................
 

deploy-guide/source/features/custom_networks.rst

@@ -254,12 +254,22 @@ 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, for example:
+   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.
 
    .. 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

deploy-guide/source/features/network_isolation.rst

@@ -928,16 +928,27 @@ 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. The following deploy command should
-work for all of the subsequent examples:
+``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:
 
 .. 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 \
+      -e baremetal-deployed-environment.yaml \
       -e /usr/share/openstack-tripleo-heat-templates/environments/network-environment.yaml \
       -e ~/templates/network-environment-overrides.yaml \
       --ntp-server pool.ntp.org

deploy-guide/source/provisioning/baremetal_provision.rst

@@ -496,8 +496,10 @@ 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 \
     -e ~/overcloud-baremetal-deployed.yaml \
     --deployed-server \
     --disable-validations \ # optional, see note below