diff --git a/environments/standalone.yaml b/environments/standalone.yaml
index d699f16826..596471cd7e 100644
--- a/environments/standalone.yaml
+++ b/environments/standalone.yaml
@@ -1,3 +1,5 @@
+# DEPRECATED.
+# This file has been replaced with environments/standalone/standalone-tripleo.yaml
 resource_registry:
   OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/noop.yaml
   OS::TripleO::Network::Ports::ControlPlaneVipPort: ../deployed-server/deployed-neutron-port.yaml
diff --git a/environments/standalone/standalone-overcloud.yaml b/environments/standalone/standalone-overcloud.yaml
new file mode 100644
index 0000000000..2d25f7f001
--- /dev/null
+++ b/environments/standalone/standalone-overcloud.yaml
@@ -0,0 +1,97 @@
+# *******************************************************************
+# 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: Standalone Environment (via undercloud)
+# description: |
+#   A Heat environment that can be used to deploy a single node all-in-one
+#   node via an Undercloud using the normal Overcloud deployment process.
+#   
+#   By default we only want the following OpenStack services to be enabled:
+#     * Keystone
+#     * Nova (and related)
+#     * Neutron (and related)
+#     * Glance
+#     * Cinder
+#     * Swift
+#     * Horizon
+#   This file disables any other OpenStack services that would normally be
+#   enabled.
+#   
+#   openstack overcloud roles generate -o ~/roles_data.yaml Standalone
+parameter_defaults:
+  # DNS servers to use for the Overcloud (2 max for some implementations). If not set the nameservers configured in the ctlplane subnet's dns_nameservers attribute will be used.
+  # Type: comma_delimited_list
+  DnsServers: []
+
+  # NTP servers list. Defaulted to pool.ntp.org in order to have a sane default for Pacemaker deployments when not configuring this parameter by default.
+  # Type: comma_delimited_list
+  NtpServer: ['pool.ntp.org']
+
+  # Name of the flavor for Standalone nodes
+  # Type: string
+  OvercloudStandaloneFlavor: standalone
+
+  # Number of Standalone nodes
+  # Type: number
+  StandaloneCount: 1
+
+  # Format for Standalone node hostnames Note %index% is translated into the index of the node, e.g 0/1/2 etc and %stackname% is replaced with the stack name e.g overcloud
+  # Type: string
+  StandaloneHostnameFormat: '%stackname%-standalone-%index%'
+
+resource_registry:
+  OS::TripleO::Services::AodhApi: OS::Heat::None
+  OS::TripleO::Services::AodhEvaluator: OS::Heat::None
+  OS::TripleO::Services::AodhListener: OS::Heat::None
+  OS::TripleO::Services::AodhNotifier: OS::Heat::None
+  OS::TripleO::Services::BarbicanApi: OS::Heat::None
+  OS::TripleO::Services::BarbicanBackendDogtag: OS::Heat::None
+  OS::TripleO::Services::BarbicanBackendKmip: OS::Heat::None
+  OS::TripleO::Services::BarbicanBackendPkcs11Crypto: OS::Heat::None
+  OS::TripleO::Services::BarbicanBackendSimpleCrypto: OS::Heat::None
+  OS::TripleO::Services::CeilometerAgentCentral: OS::Heat::None
+  OS::TripleO::Services::CeilometerAgentNotification: OS::Heat::None
+  OS::TripleO::Services::ComputeCeilometerAgent: OS::Heat::None
+  OS::TripleO::Services::Congress: OS::Heat::None
+  OS::TripleO::Services::DesignateApi: OS::Heat::None
+  OS::TripleO::Services::DesignateCentral: OS::Heat::None
+  OS::TripleO::Services::DesignateMDNS: OS::Heat::None
+  OS::TripleO::Services::DesignateProducer: OS::Heat::None
+  OS::TripleO::Services::DesignateSink: OS::Heat::None
+  OS::TripleO::Services::DesignateWorker: OS::Heat::None
+  OS::TripleO::Services::GnocchiApi: OS::Heat::None
+  OS::TripleO::Services::GnocchiMetricd: OS::Heat::None
+  OS::TripleO::Services::GnocchiStatsd: OS::Heat::None
+  OS::TripleO::Services::HeatApi: OS::Heat::None
+  OS::TripleO::Services::HeatApiCfn: OS::Heat::None
+  OS::TripleO::Services::HeatApiCloudwatch: OS::Heat::None
+  OS::TripleO::Services::HeatEngine: OS::Heat::None
+  OS::TripleO::Services::IronicApi: OS::Heat::None
+  OS::TripleO::Services::IronicConductor: OS::Heat::None
+  OS::TripleO::Services::IronicInspector: OS::Heat::None
+  OS::TripleO::Services::IronicNeutronAgent: OS::Heat::None
+  OS::TripleO::Services::IronicPxe: OS::Heat::None
+  OS::TripleO::Services::Kubernetes::Master: OS::Heat::None
+  OS::TripleO::Services::Kubernetes::Worker: OS::Heat::None
+  OS::TripleO::Services::ManilaApi: OS::Heat::None
+  OS::TripleO::Services::ManilaBackendCephFs: OS::Heat::None
+  OS::TripleO::Services::ManilaBackendIsilon: OS::Heat::None
+  OS::TripleO::Services::ManilaBackendNetapp: OS::Heat::None
+  OS::TripleO::Services::ManilaBackendUnity: OS::Heat::None
+  OS::TripleO::Services::ManilaBackendVMAX: OS::Heat::None
+  OS::TripleO::Services::ManilaBackendVNX: OS::Heat::None
+  OS::TripleO::Services::ManilaScheduler: OS::Heat::None
+  OS::TripleO::Services::ManilaShare: OS::Heat::None
+  OS::TripleO::Services::MistralApi: OS::Heat::None
+  OS::TripleO::Services::MistralEngine: OS::Heat::None
+  OS::TripleO::Services::MistralEventEngine: OS::Heat::None
+  OS::TripleO::Services::MistralExecutor: OS::Heat::None
+  OS::TripleO::Services::PankoApi: OS::Heat::None
+  OS::TripleO::Services::SaharaApi: OS::Heat::None
+  OS::TripleO::Services::SaharaEngine: OS::Heat::None
+  OS::TripleO::Services::Tacker: OS::Heat::None
+  OS::TripleO::Services::Zaqar: OS::Heat::None
+  OS::TripleO::Standalone::Net::SoftwareConfig: ../../net-config-bridge.yaml
diff --git a/environments/standalone/standalone-tripleo.yaml b/environments/standalone/standalone-tripleo.yaml
new file mode 100644
index 0000000000..906b0f3ab3
--- /dev/null
+++ b/environments/standalone/standalone-tripleo.yaml
@@ -0,0 +1,105 @@
+# *******************************************************************
+# 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: Standalone Environment (no undercloud)
+# description: |
+#   A Heat environment that can be used to deploy a single node all-in-one
+#   node via the 'overcloud tripleo deploy' command. This does not
+#   require an Undercloud for the deployment and can be used to deploy
+#   a single node on the local machine.
+#   
+#   By default we only want the following OpenStack services to be enabled:
+#     * Keystone
+#     * Nova (and related)
+#     * Neutron (and related)
+#     * Glance
+#     * Cinder
+#     * Swift
+#     * Horizon
+#   This file disables any other OpenStack services that would normally be
+#   enabled.
+#   
+#   openstack overcloud roles generate -o ~/roles_data.yaml Standalone
+parameter_defaults:
+  # DNS servers to use for the Overcloud (2 max for some implementations). If not set the nameservers configured in the ctlplane subnet's dns_nameservers attribute will be used.
+  # Type: comma_delimited_list
+  DnsServers: []
+
+  # Set to true to enable package installation at deploy time
+  # Type: boolean
+  EnablePackageInstall: True
+
+  # NTP servers list. Defaulted to pool.ntp.org in order to have a sane default for Pacemaker deployments when not configuring this parameter by default.
+  # Type: comma_delimited_list
+  NtpServer: ['pool.ntp.org']
+
+  # How the server should receive the metadata required for software configuration.
+  # Type: string
+  SoftwareConfigTransport: POLL_SERVER_HEAT
+
+  # Heat action on performed top-level stack.  Note StackUpdateType is set to UPGRADE when a major-version upgrade is in progress.
+  # Mandatory. This parameter must be set by the user.
+  # Type: string
+  StackAction: CREATE
+
+resource_registry:
+  OS::TripleO::Network::Ports::ControlPlaneVipPort: ../../deployed-server/deployed-neutron-port.yaml
+  OS::TripleO::Network::Ports::RedisVipPort: ../../network/ports/noop.yaml
+  OS::TripleO::NodeExtraConfigPost: ../../extraconfig/post_deploy/standalone_post.yaml
+  OS::TripleO::Services::AodhApi: OS::Heat::None
+  OS::TripleO::Services::AodhEvaluator: OS::Heat::None
+  OS::TripleO::Services::AodhListener: OS::Heat::None
+  OS::TripleO::Services::AodhNotifier: OS::Heat::None
+  OS::TripleO::Services::BarbicanApi: OS::Heat::None
+  OS::TripleO::Services::BarbicanBackendDogtag: OS::Heat::None
+  OS::TripleO::Services::BarbicanBackendKmip: OS::Heat::None
+  OS::TripleO::Services::BarbicanBackendPkcs11Crypto: OS::Heat::None
+  OS::TripleO::Services::BarbicanBackendSimpleCrypto: OS::Heat::None
+  OS::TripleO::Services::CeilometerAgentCentral: OS::Heat::None
+  OS::TripleO::Services::CeilometerAgentNotification: OS::Heat::None
+  OS::TripleO::Services::ComputeCeilometerAgent: OS::Heat::None
+  OS::TripleO::Services::Congress: OS::Heat::None
+  OS::TripleO::Services::DesignateApi: OS::Heat::None
+  OS::TripleO::Services::DesignateCentral: OS::Heat::None
+  OS::TripleO::Services::DesignateMDNS: OS::Heat::None
+  OS::TripleO::Services::DesignateProducer: OS::Heat::None
+  OS::TripleO::Services::DesignateSink: OS::Heat::None
+  OS::TripleO::Services::DesignateWorker: OS::Heat::None
+  OS::TripleO::Services::GnocchiApi: OS::Heat::None
+  OS::TripleO::Services::GnocchiMetricd: OS::Heat::None
+  OS::TripleO::Services::GnocchiStatsd: OS::Heat::None
+  OS::TripleO::Services::HAproxy: OS::Heat::None
+  OS::TripleO::Services::HeatApi: OS::Heat::None
+  OS::TripleO::Services::HeatApiCfn: OS::Heat::None
+  OS::TripleO::Services::HeatApiCloudwatch: OS::Heat::None
+  OS::TripleO::Services::HeatEngine: OS::Heat::None
+  OS::TripleO::Services::IronicApi: OS::Heat::None
+  OS::TripleO::Services::IronicConductor: OS::Heat::None
+  OS::TripleO::Services::IronicInspector: OS::Heat::None
+  OS::TripleO::Services::IronicNeutronAgent: OS::Heat::None
+  OS::TripleO::Services::IronicPxe: OS::Heat::None
+  OS::TripleO::Services::Keepalived: OS::Heat::None
+  OS::TripleO::Services::Kubernetes::Master: OS::Heat::None
+  OS::TripleO::Services::Kubernetes::Worker: OS::Heat::None
+  OS::TripleO::Services::ManilaApi: OS::Heat::None
+  OS::TripleO::Services::ManilaBackendCephFs: OS::Heat::None
+  OS::TripleO::Services::ManilaBackendIsilon: OS::Heat::None
+  OS::TripleO::Services::ManilaBackendNetapp: OS::Heat::None
+  OS::TripleO::Services::ManilaBackendUnity: OS::Heat::None
+  OS::TripleO::Services::ManilaBackendVMAX: OS::Heat::None
+  OS::TripleO::Services::ManilaBackendVNX: OS::Heat::None
+  OS::TripleO::Services::ManilaScheduler: OS::Heat::None
+  OS::TripleO::Services::ManilaShare: OS::Heat::None
+  OS::TripleO::Services::MistralApi: OS::Heat::None
+  OS::TripleO::Services::MistralEngine: OS::Heat::None
+  OS::TripleO::Services::MistralEventEngine: OS::Heat::None
+  OS::TripleO::Services::MistralExecutor: OS::Heat::None
+  OS::TripleO::Services::PankoApi: OS::Heat::None
+  OS::TripleO::Services::SaharaApi: OS::Heat::None
+  OS::TripleO::Services::SaharaEngine: OS::Heat::None
+  OS::TripleO::Services::Tacker: OS::Heat::None
+  OS::TripleO::Services::Zaqar: OS::Heat::None
+  OS::TripleO::Standalone::Net::SoftwareConfig: ../../net-config-standalone.yaml
diff --git a/releasenotes/notes/all-in-one-via-undercloud.yaml-8766b43a20a4270f.yaml b/releasenotes/notes/all-in-one-via-undercloud.yaml-8766b43a20a4270f.yaml
new file mode 100644
index 0000000000..a04c36ef32
--- /dev/null
+++ b/releasenotes/notes/all-in-one-via-undercloud.yaml-8766b43a20a4270f.yaml
@@ -0,0 +1,14 @@
+---
+features:
+  - |
+    We now provide an example set of environment files that can be used to
+    deploy a single all-in-one standalone cloud node via the
+    'openstack overcloud deploy' and 'openstack tripleo deploy' (experimental)
+    commands.
+    For the overcloud deployment, use `environments/standalone/standalone-overcloud.yaml`.
+    For the tripleo deploy deployment, use `environments/standalone/standalone-tripleo.yaml`.
+deprecations:
+  - |
+    The environments/standalone.yaml has been deprecated and should be replaced
+    with environments/standalone/standalone-tripleo.yaml when using the
+    'openstack tripleo deploy' command.
diff --git a/roles/Standalone.yaml b/roles/Standalone.yaml
index 2a14af55c9..ecd1cc0f58 100644
--- a/roles/Standalone.yaml
+++ b/roles/Standalone.yaml
@@ -3,9 +3,10 @@
 ###############################################################################
 - name: Standalone
   description: |
-    EXPERIMENTAL. A standalone role that a minimal set of services.
-    This can be used for testing in a single node configuration with the
-    'openstack tripleo deploy --standalone' command.
+    A standalone role that a minimal set of services. This can be used for
+    testing in a single node configuration with the
+    'openstack tripleo deploy --standalone' command or via an Undercloud using
+    'openstack overcloud deploy'.
   CountDefault: 1
   tags:
     - primary
diff --git a/sample-env-generator/standalone.yaml b/sample-env-generator/standalone.yaml
new file mode 100644
index 0000000000..03c07e813b
--- /dev/null
+++ b/sample-env-generator/standalone.yaml
@@ -0,0 +1,254 @@
+#
+# This environment generator is used to generate some sample composable role
+# environment files.
+#
+environments:
+  -
+    name: standalone/standalone-tripleo
+    title: Standalone Environment (no undercloud)
+    description: |
+      A Heat environment that can be used to deploy a single node all-in-one
+      node via the 'overcloud tripleo deploy' command. This does not
+      require an Undercloud for the deployment and can be used to deploy
+      a single node on the local machine.
+
+      By default we only want the following OpenStack services to be enabled:
+        * Keystone
+        * Nova (and related)
+        * Neutron (and related)
+        * Glance
+        * Cinder
+        * Swift
+        * Horizon
+      This file disables any other OpenStack services that would normally be
+      enabled.
+
+      openstack overcloud roles generate -o ~/roles_data.yaml Standalone
+    files:
+      puppet/services/time/ntp.yaml:
+        parameters:
+          - NtpServer
+      puppet/services/tripleo-packages.yaml:
+        parameters:
+          - EnablePackageInstall
+      # TODO(aschultz): hack to pull in this config transport, not sure it is
+      # still neded.
+      puppet/controller-role.yaml:
+        parameters:
+          - SoftwareConfigTransport
+          - DnsServers
+      puppet/all-nodes-config.yaml:
+        parameters:
+          - StackAction
+    sample_values:
+      StackAction: CREATE
+      SoftwareConfigTransport: POLL_SERVER_HEAT
+      EnablePackageInstall: true
+    resource_registry:
+      # this network config is assumed by the tripleo deploy command
+      OS::TripleO::Network::Ports::RedisVipPort: ../../network/ports/noop.yaml
+      OS::TripleO::Network::Ports::ControlPlaneVipPort: ../../deployed-server/deployed-neutron-port.yaml
+      OS::TripleO::Standalone::Net::SoftwareConfig: ../../net-config-standalone.yaml
+      OS::TripleO::NodeExtraConfigPost: ../../extraconfig/post_deploy/standalone_post.yaml
+
+      # Disable non-openstack services that are enabled by default
+      OS::TripleO::Services::HAproxy: OS::Heat::None
+      OS::TripleO::Services::Keepalived: OS::Heat::None
+      OS::TripleO::Services::Kubernetes::Master: OS::Heat::None
+      OS::TripleO::Services::Kubernetes::Worker: OS::Heat::None
+
+      # Aodh
+      OS::TripleO::Services::AodhApi: OS::Heat::None
+      OS::TripleO::Services::AodhEvaluator: OS::Heat::None
+      OS::TripleO::Services::AodhEvaluator: OS::Heat::None
+      OS::TripleO::Services::AodhListener: OS::Heat::None
+      OS::TripleO::Services::AodhNotifier: OS::Heat::None
+      # Barbican
+      OS::TripleO::Services::BarbicanApi: OS::Heat::None
+      OS::TripleO::Services::BarbicanBackendDogtag: OS::Heat::None
+      OS::TripleO::Services::BarbicanBackendKmip: OS::Heat::None
+      OS::TripleO::Services::BarbicanBackendPkcs11Crypto: OS::Heat::None
+      OS::TripleO::Services::BarbicanBackendSimpleCrypto: OS::Heat::None
+      # Ceilometer
+      OS::TripleO::Services::CeilometerAgentCentral: OS::Heat::None
+      OS::TripleO::Services::CeilometerAgentNotification: OS::Heat::None
+      OS::TripleO::Services::ComputeCeilometerAgent: OS::Heat::None
+      # Congress
+      OS::TripleO::Services::Congress: OS::Heat::None
+      # Designate
+      OS::TripleO::Services::DesignateApi: OS::Heat::None
+      OS::TripleO::Services::DesignateCentral: OS::Heat::None
+      OS::TripleO::Services::DesignateMDNS: OS::Heat::None
+      OS::TripleO::Services::DesignateProducer: OS::Heat::None
+      OS::TripleO::Services::DesignateSink: OS::Heat::None
+      OS::TripleO::Services::DesignateWorker: OS::Heat::None
+      # Gnocchi
+      OS::TripleO::Services::GnocchiApi: OS::Heat::None
+      OS::TripleO::Services::GnocchiMetricd: OS::Heat::None
+      OS::TripleO::Services::GnocchiStatsd: OS::Heat::None
+      # Heat
+      OS::TripleO::Services::HeatApi: OS::Heat::None
+      OS::TripleO::Services::HeatApiCfn: OS::Heat::None
+      OS::TripleO::Services::HeatApiCloudwatch: OS::Heat::None
+      OS::TripleO::Services::HeatEngine: OS::Heat::None
+      # Ironic
+      OS::TripleO::Services::IronicApi: OS::Heat::None
+      OS::TripleO::Services::IronicConductor: OS::Heat::None
+      OS::TripleO::Services::IronicInspector: OS::Heat::None
+      OS::TripleO::Services::IronicNeutronAgent: OS::Heat::None
+      OS::TripleO::Services::IronicPxe: OS::Heat::None
+      # Manila
+      OS::TripleO::Services::ManilaApi: OS::Heat::None
+      OS::TripleO::Services::ManilaBackendCephFs: OS::Heat::None
+      OS::TripleO::Services::ManilaBackendIsilon: OS::Heat::None
+      OS::TripleO::Services::ManilaBackendNetapp: OS::Heat::None
+      OS::TripleO::Services::ManilaBackendUnity: OS::Heat::None
+      OS::TripleO::Services::ManilaBackendVMAX: OS::Heat::None
+      OS::TripleO::Services::ManilaBackendVNX: OS::Heat::None
+      OS::TripleO::Services::ManilaScheduler: OS::Heat::None
+      OS::TripleO::Services::ManilaShare: OS::Heat::None
+      # Mistral
+      OS::TripleO::Services::MistralApi: OS::Heat::None
+      OS::TripleO::Services::MistralEngine: OS::Heat::None
+      OS::TripleO::Services::MistralEventEngine: OS::Heat::None
+      OS::TripleO::Services::MistralExecutor: OS::Heat::None
+      # Panko
+      OS::TripleO::Services::PankoApi: OS::Heat::None
+      # Sahara
+      OS::TripleO::Services::SaharaApi: OS::Heat::None
+      OS::TripleO::Services::SaharaEngine: OS::Heat::None
+      # Tacker
+      OS::TripleO::Services::Tacker: OS::Heat::None
+      # Zaqar
+      OS::TripleO::Services::Zaqar: OS::Heat::None
+
+  -
+    name: standalone/standalone-overcloud
+    title: Standalone Environment (via undercloud)
+    description: |
+      A Heat environment that can be used to deploy a single node all-in-one
+      node via an Undercloud using the normal Overcloud deployment process.
+
+      By default we only want the following OpenStack services to be enabled:
+        * Keystone
+        * Nova (and related)
+        * Neutron (and related)
+        * Glance
+        * Cinder
+        * Swift
+        * Horizon
+      This file disables any other OpenStack services that would normally be
+      enabled.
+
+      openstack overcloud roles generate -o ~/roles_data.yaml Standalone
+    files:
+      puppet/services/time/ntp.yaml:
+        parameters:
+          - NtpServer
+      # TODO(aschultz): hack to pull in this config transport, not sure it is
+      # still neded.
+      puppet/controller-role.yaml:
+        parameters:
+          - DnsServers
+      sample-env-generator/standalone.yaml:
+        parameters:
+          - StandaloneHostnameFormat
+          - StandaloneCount
+          - OvercloudStandaloneFlavor
+    sample_values:
+      StandaloneCount: 1
+      OvercloudStandaloneFlavor: standalone
+    resource_registry:
+      OS::TripleO::Standalone::Net::SoftwareConfig: ../../net-config-bridge.yaml
+
+      # Disable non-openstack services that are enabled by default
+      OS::TripleO::Services::Kubernetes::Master: OS::Heat::None
+      OS::TripleO::Services::Kubernetes::Worker: OS::Heat::None
+
+      # Aodh
+      OS::TripleO::Services::AodhApi: OS::Heat::None
+      OS::TripleO::Services::AodhEvaluator: OS::Heat::None
+      OS::TripleO::Services::AodhEvaluator: OS::Heat::None
+      OS::TripleO::Services::AodhListener: OS::Heat::None
+      OS::TripleO::Services::AodhNotifier: OS::Heat::None
+      # Barbican
+      OS::TripleO::Services::BarbicanApi: OS::Heat::None
+      OS::TripleO::Services::BarbicanBackendDogtag: OS::Heat::None
+      OS::TripleO::Services::BarbicanBackendKmip: OS::Heat::None
+      OS::TripleO::Services::BarbicanBackendPkcs11Crypto: OS::Heat::None
+      OS::TripleO::Services::BarbicanBackendSimpleCrypto: OS::Heat::None
+      # Ceilometer
+      OS::TripleO::Services::CeilometerAgentCentral: OS::Heat::None
+      OS::TripleO::Services::CeilometerAgentNotification: OS::Heat::None
+      OS::TripleO::Services::ComputeCeilometerAgent: OS::Heat::None
+      # Congress
+      OS::TripleO::Services::Congress: OS::Heat::None
+      # Designate
+      OS::TripleO::Services::DesignateApi: OS::Heat::None
+      OS::TripleO::Services::DesignateCentral: OS::Heat::None
+      OS::TripleO::Services::DesignateMDNS: OS::Heat::None
+      OS::TripleO::Services::DesignateProducer: OS::Heat::None
+      OS::TripleO::Services::DesignateSink: OS::Heat::None
+      OS::TripleO::Services::DesignateWorker: OS::Heat::None
+      # Gnocchi
+      OS::TripleO::Services::GnocchiApi: OS::Heat::None
+      OS::TripleO::Services::GnocchiMetricd: OS::Heat::None
+      OS::TripleO::Services::GnocchiStatsd: OS::Heat::None
+      # Heat
+      OS::TripleO::Services::HeatApi: OS::Heat::None
+      OS::TripleO::Services::HeatApiCfn: OS::Heat::None
+      OS::TripleO::Services::HeatApiCloudwatch: OS::Heat::None
+      OS::TripleO::Services::HeatEngine: OS::Heat::None
+      # Ironic
+      OS::TripleO::Services::IronicApi: OS::Heat::None
+      OS::TripleO::Services::IronicConductor: OS::Heat::None
+      OS::TripleO::Services::IronicInspector: OS::Heat::None
+      OS::TripleO::Services::IronicNeutronAgent: OS::Heat::None
+      OS::TripleO::Services::IronicPxe: OS::Heat::None
+      # Manila
+      OS::TripleO::Services::ManilaApi: OS::Heat::None
+      OS::TripleO::Services::ManilaBackendCephFs: OS::Heat::None
+      OS::TripleO::Services::ManilaBackendIsilon: OS::Heat::None
+      OS::TripleO::Services::ManilaBackendNetapp: OS::Heat::None
+      OS::TripleO::Services::ManilaBackendUnity: OS::Heat::None
+      OS::TripleO::Services::ManilaBackendVMAX: OS::Heat::None
+      OS::TripleO::Services::ManilaBackendVNX: OS::Heat::None
+      OS::TripleO::Services::ManilaScheduler: OS::Heat::None
+      OS::TripleO::Services::ManilaShare: OS::Heat::None
+      # Mistral
+      OS::TripleO::Services::MistralApi: OS::Heat::None
+      OS::TripleO::Services::MistralEngine: OS::Heat::None
+      OS::TripleO::Services::MistralEventEngine: OS::Heat::None
+      OS::TripleO::Services::MistralExecutor: OS::Heat::None
+      # Panko
+      OS::TripleO::Services::PankoApi: OS::Heat::None
+      # Sahara
+      OS::TripleO::Services::SaharaApi: OS::Heat::None
+      OS::TripleO::Services::SaharaEngine: OS::Heat::None
+      # Tacker
+      OS::TripleO::Services::Tacker: OS::Heat::None
+      # Zaqar
+      OS::TripleO::Services::Zaqar: OS::Heat::None
+
+# NOTE(aschultz): So because these are dynamic based on the roles used, we
+# do not currently define these in any heat files. So we're defining them here
+# so that the sample env generator can still provide these configuration items
+# in the generated config files.
+parameters:
+  # Dynamic vars based on roles
+  StandaloneCount:
+    default: 0
+    description: Number of Standalone nodes
+    type: number
+  StandaloneHostnameFormat:
+    type: string
+    description: >
+      Format for Standalone node hostnames
+      Note %index% is translated into the index of the node, e.g 0/1/2 etc
+      and %stackname% is replaced with the stack name e.g overcloud
+    default: "%stackname%-standalone-%index%"
+  OvercloudStandaloneFlavor:
+    default: standalone
+    description: Name of the flavor for Standalone nodes
+    type: string
+