From a99968389148e0c71ddb59b7a9ccaa964c4ecb51 Mon Sep 17 00:00:00 2001
From: Mathieu Mitchell <mmitchell@iweb.com>
Date: Tue, 13 Sep 2016 20:14:31 -0400
Subject: [PATCH] [install-guide] Import "Flavor creation"

Import "Flavor creation" under a new "Create Compute flavors for use
with the Bare Metal service" block inside of the "Integration
with other OpenStack services" section.

Change-Id: Ic37f43a34d577f99d9a1f08300a87c553c1b026f
Partial-bug: #1612278
---
 doc/source/deploy/install-guide.rst           | 29 ++------------
 .../source/configure-integration.rst          |  2 +
 .../source/include/configure-nova-flavors.rst | 39 +++++++++++++++++++
 3 files changed, 44 insertions(+), 26 deletions(-)
 create mode 100644 install-guide/source/include/configure-nova-flavors.rst

diff --git a/doc/source/deploy/install-guide.rst b/doc/source/deploy/install-guide.rst
index f82db5aeec..8a9a97dc54 100644
--- a/doc/source/deploy/install-guide.rst
+++ b/doc/source/deploy/install-guide.rst
@@ -91,33 +91,10 @@ Install Guide.
 Flavor creation
 ===============
 
-You'll need to create a special bare metal flavor in the Compute service.
-The flavor is mapped to the bare metal node through the hardware specifications.
-
-#. Change these to match your hardware::
-
-    RAM_MB=1024
-    CPU=2
-    DISK_GB=100
-    ARCH={i686|x86_64}
-
-#. Create the bare metal flavor by executing the following command::
-
-    nova flavor-create my-baremetal-flavor auto $RAM_MB $DISK_GB $CPU
-
-   *Note: You can replace auto with your own flavor id.*
-
-#. Set the architecture as extra_specs information of the flavor. This
-   will be used to match against the properties of bare metal nodes::
-
-    nova flavor-key my-baremetal-flavor set cpu_arch=$ARCH
-
-#. Associate the deploy ramdisk and kernel images with the ironic node::
-
-    ironic node-update $NODE_UUID add \
-    driver_info/deploy_kernel=$DEPLOY_VMLINUZ_UUID \
-    driver_info/deploy_ramdisk=$DEPLOY_INITRD_UUID
+The `Flavor creation`_ section has been moved to the Bare Metal service Install
+Guide.
 
+.. _`Flavor creation`: http://docs.openstack.org/project-install-guide/baremetal/draft/configure-integration.html#configure-compute-flavors-for-use-with-the-bare-metal-service
 
 Setup the drivers for the Bare Metal service
 ============================================
diff --git a/install-guide/source/configure-integration.rst b/install-guide/source/configure-integration.rst
index 2529412436..f64dcea86a 100644
--- a/install-guide/source/configure-integration.rst
+++ b/install-guide/source/configure-integration.rst
@@ -6,6 +6,8 @@ Integration with other OpenStack services
 
 .. include:: include/configure-nova-compute.rst
 
+.. include:: include/configure-nova-flavors.rst
+
 .. include:: include/configure-neutron-networks.rst
 
 .. include:: include/configure-glance-images.rst
diff --git a/install-guide/source/include/configure-nova-flavors.rst b/install-guide/source/include/configure-nova-flavors.rst
new file mode 100644
index 0000000000..62cf42a9b4
--- /dev/null
+++ b/install-guide/source/include/configure-nova-flavors.rst
@@ -0,0 +1,39 @@
+.. _flavor-creation:
+
+Create Compute flavors for use with the Bare Metal service
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You'll need to create a special bare metal flavor in the Compute service.
+The flavor is mapped to the bare metal node through the hardware specifications.
+
+#. Change these to match your hardware:
+
+   .. code-block:: console
+
+      $ RAM_MB=1024
+      $ CPU=2
+      $ DISK_GB=100
+      $ ARCH={i686|x86_64}
+
+#. Create the bare metal flavor by executing the following command:
+
+   .. code-block:: console
+
+      $ nova flavor-create my-baremetal-flavor auto $RAM_MB $DISK_GB $CPU
+
+   .. note:: You can replace ``auto`` with your own flavor id.
+
+#. Set the architecture as extra_specs information of the flavor. This
+   will be used to match against the properties of bare metal nodes:
+
+   .. code-block:: console
+
+      $ nova flavor-key my-baremetal-flavor set cpu_arch=$ARCH
+
+#. Associate the deploy ramdisk and kernel images with the ironic node:
+
+   .. code-block:: console
+
+      $ ironic node-update $NODE_UUID add \
+          driver_info/deploy_kernel=$DEPLOY_VMLINUZ_UUID \
+          driver_info/deploy_ramdisk=$DEPLOY_INITRD_UUID