From 4f2ae35882db1ec754895ed678654614cbc3834e Mon Sep 17 00:00:00 2001
From: Ben Nemec <bnemec@redhat.com>
Date: Mon, 22 Jan 2018 14:39:16 -0600
Subject: [PATCH] Add more granular boot-from-volume envs

There may be situations where it is useful to boot only the
undercloud or only the baremetal nodes from volume.  This commit
adds environment files to enable that.
---
 doc/source/deploy/environment-index.rst       | 18 ++++++++++++++
 environments/boot-baremetal-from-volume.yaml  | 17 +++++++++++++
 environments/boot-undercloud-from-volume.yaml | 17 +++++++++++++
 sample-env-generator/environments.yaml        | 24 +++++++++++++++++++
 4 files changed, 76 insertions(+)
 create mode 100644 environments/boot-baremetal-from-volume.yaml
 create mode 100644 environments/boot-undercloud-from-volume.yaml

diff --git a/doc/source/deploy/environment-index.rst b/doc/source/deploy/environment-index.rst
index 8bae8f0..7fc4701 100644
--- a/doc/source/deploy/environment-index.rst
+++ b/doc/source/deploy/environment-index.rst
@@ -82,6 +82,15 @@ the host cloud, but at the cost of potential inconsistency if the state
 of a baremetal instance is changed without using the BMC.
 
 
+Boot Baremetal Instances from Volume
+------------------------------------
+
+**File:** environments/boot-baremetal-from-volume.yaml
+
+**Description:** Boot the baremetal instances from Cinder volumes instead of
+ephemeral storage.
+
+
 Boot Undercloud and Baremetal Instances from Volume
 ---------------------------------------------------
 
@@ -91,6 +100,15 @@ Boot Undercloud and Baremetal Instances from Volume
 ephemeral storage.
 
 
+Boot Undercloud Instance from Volume
+------------------------------------
+
+**File:** environments/boot-undercloud-from-volume.yaml
+
+**Description:** Boot the undercloud instance from a Cinder volume instead of
+ephemeral storage.
+
+
 Create a Private Network
 ------------------------
 
diff --git a/environments/boot-baremetal-from-volume.yaml b/environments/boot-baremetal-from-volume.yaml
new file mode 100644
index 0000000..f578591
--- /dev/null
+++ b/environments/boot-baremetal-from-volume.yaml
@@ -0,0 +1,17 @@
+# *******************************************************************
+# This file was created automatically by the sample environment
+# generator. Developers should use `tox -e genconfig` to update it.
+# Users are recommended to make changes to a copy of the file instead
+# of the original, if any customizations are needed.
+# *******************************************************************
+# title: Boot Baremetal Instances from Volume
+# description: |
+#   Boot the baremetal instances from Cinder volumes instead of
+#   ephemeral storage.
+parameter_defaults:
+  # The size of the baremetal instance volumes
+  # Type: number
+  baremetal_volume_size: 41
+
+resource_registry:
+  OS::OVB::ServerPair: ../templates/virtual-baremetal-servers-volume.yaml
diff --git a/environments/boot-undercloud-from-volume.yaml b/environments/boot-undercloud-from-volume.yaml
new file mode 100644
index 0000000..22693ec
--- /dev/null
+++ b/environments/boot-undercloud-from-volume.yaml
@@ -0,0 +1,17 @@
+# *******************************************************************
+# This file was created automatically by the sample environment
+# generator. Developers should use `tox -e genconfig` to update it.
+# Users are recommended to make changes to a copy of the file instead
+# of the original, if any customizations are needed.
+# *******************************************************************
+# title: Boot Undercloud Instance from Volume
+# description: |
+#   Boot the undercloud instance from a Cinder volume instead of
+#   ephemeral storage.
+parameter_defaults:
+  # The size of the volume for the undercloud instance
+  # Type: number
+  undercloud_volume_size: 50
+
+resource_registry:
+  OS::OVB::UndercloudEnvironment: ../templates/undercloud-volume.yaml
diff --git a/sample-env-generator/environments.yaml b/sample-env-generator/environments.yaml
index 34112e6..b9cbb07 100644
--- a/sample-env-generator/environments.yaml
+++ b/sample-env-generator/environments.yaml
@@ -183,6 +183,30 @@ environments:
     resource_registry:
       OS::OVB::UndercloudEnvironment: ../templates/undercloud-volume.yaml
       OS::OVB::ServerPair: ../templates/virtual-baremetal-servers-volume.yaml
+  -
+    name: boot-baremetal-from-volume
+    title: Boot Baremetal Instances from Volume
+    description: |
+      Boot the baremetal instances from Cinder volumes instead of
+      ephemeral storage.
+    files:
+      templates/virtual-baremetal-servers-volume.yaml:
+        parameters:
+          - baremetal_volume_size
+    resource_registry:
+      OS::OVB::ServerPair: ../templates/virtual-baremetal-servers-volume.yaml
+  -
+    name: boot-undercloud-from-volume
+    title: Boot Undercloud Instance from Volume
+    description: |
+      Boot the undercloud instance from a Cinder volume instead of
+      ephemeral storage.
+    files:
+      templates/undercloud-volume.yaml:
+        parameters:
+          - undercloud_volume_size
+    resource_registry:
+      OS::OVB::UndercloudEnvironment: ../templates/undercloud-volume.yaml
   -
     name: bmc-use-cache
     title: Enable Instance Status Caching in BMC