From e27b68e217368cf3ce90d317683e1dbf0b429ed8 Mon Sep 17 00:00:00 2001
From: John Trowbridge <trown@redhat.com>
Date: Wed, 15 Jul 2015 14:57:02 -0400
Subject: [PATCH] [Doc] Add doc for overcloud node registration

Change-Id: I60e30d002eedfeac0f79ff6d124e8633197dc11b
---
 .../basic_deployment/basic_deployment.rst     | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/doc/source/basic_deployment/basic_deployment.rst b/doc/source/basic_deployment/basic_deployment.rst
index 2aa5a2f1d..724cf8a05 100644
--- a/doc/source/basic_deployment/basic_deployment.rst
+++ b/doc/source/basic_deployment/basic_deployment.rst
@@ -250,28 +250,6 @@ subnet. Define the nameserver to be used for the environment::
 Deploy the Overcloud
 --------------------
 
-.. admonition:: RHEL Satellite Registration
-   :class: satellite
-
-   To register the Overcloud nodes to a Satellite define the following
-   variables. Only using an activation key is supported when registering to
-   Satellite, username/password is not supported for security reasons. The
-   activation key must enable the repos shown::
-
-          export REG_METHOD=satellite
-          # REG_SAT_URL should be in the format of:
-          # http://<satellite-hostname>
-          export REG_SAT_URL="[satellite url]"
-          export REG_ORG="[satellite org]"
-          export REG_ACTIVATION_KEY="[activation key]"
-          # Activation key must enable these repos:
-          # rhel-7-server-rpms
-          # rhel-7-server-optional-rpms
-          # rhel-7-server-extras-rpms
-          # rhel-7-server-openstack-6.0-rpms
-
-#. Deploy the overcloud:
-
    By default 1 compute and 1 control node will be deployed, with networking
    configured for the virtual environment.  To customize this, see the output of::
 
@@ -292,6 +270,28 @@ Deploy the Overcloud
 
           --cinder-lvm
 
+   .. admonition:: RHEL Satellite Registration
+      :class: satellite
+
+      To register the Overcloud nodes to a Satellite add the following flags
+      to the deploy command::
+
+             --rhel-reg --reg-method satellite --reg-org <ORG ID#> --reg-sat-url <satellite URL> --reg-activation-key <KEY>
+
+      .. note::
+
+          Only using an activation key is supported when registering to
+          Satellite, username/password is not supported for security reasons.
+          The activation key must enable the following repos:
+
+          rhel-7-server-rpms
+
+          rhel-7-server-optional-rpms
+
+          rhel-7-server-extras-rpms
+
+          rhel-7-server-openstack-6.0-rpms
+
    ::
 
       openstack overcloud deploy --plan overcloud