diff --git a/config/general_config/featureset032.yml b/config/general_config/featureset032.yml
new file mode 100644
index 000000000..d496efc45
--- /dev/null
+++ b/config/general_config/featureset032.yml
@@ -0,0 +1,25 @@
+# Featureset for deploying a 2 controller setup using the deployed server
+# method
+
+undercloud_generate_service_certificate: false
+ssl_overcloud: false
+test_ping: true
+
+# Note(trown): overriding the key these set, so setting them to false
+deploy_composable_scenario: false
+composable_services: false
+composable_roles: false
+
+composable_args: ""
+
+# Note(trown): The tripleo-ci repo is used here because we do not yet support
+# deployed server on libvirt. We will want to move any heat environments we
+# use from the tripleo-ci repo to the tripleo-heat-templates repo when we add
+# support for deployed server deployments on libvirt.
+multinode_args: >-
+    -e {{ overcloud_templates_path }}/environments/deployed-server-environment.yaml
+    -e {{ tripleo_root }}/tripleo-ci/test-environments/multinode-3nodes.yaml
+    -r {{ overcloud_templates_path }}/ci/environments/multinode-3nodes.yaml
+    -e {{ overcloud_templates_path }}/environments/deployed-server-bootstrap-environment-centos.yaml
+enable_pacemaker: true
+
diff --git a/doc/source/feature-configuration.rst b/doc/source/feature-configuration.rst
index f3c620de9..f7bded142 100644
--- a/doc/source/feature-configuration.rst
+++ b/doc/source/feature-configuration.rst
@@ -18,66 +18,67 @@ Below is a table with various features listed in each row and the features enabl
 in each feature set configuration file in each column. When adding new configurations
 please consult the following `etherpad <https://etherpad.openstack.org/p/quickstart-featuresets>`_
 
-+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+
-|  FS | ipv6 | SSL UC | SSL OC | NI SN | NI MN | NI BOND | introsp | UC idem | cont UC | cont OC | cont upg | validations | ping | tempest | sc001 | sc002 | sc003 | sc004 | sc005 | sc006 | sc007 |nonha   | ceph | HC |
-+=====+======+========+========+=======+=======+=========+=========+=========+=========+=========+==========+=============+======+=========+=======+=======+=======+=======+=======+=======+=======+========+======+====+
-| 001 |      | X      | X      |       | X     |         | X       |         |         |         |          |             | X    |         |       |       |       |       |       |       |       |        |      |    |
-+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+
-| 002 |      | X      | X      |       | X     |         | X       |         |         |         |          |             | X    |         |       |       |       |       |       |       |       |        |      |    |
-+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+
-| 003 |      |        |        |       |       |         |         | X       |         |         |          |             |      |         |       |       |       |       |       |       |       |        |      |    |
-+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+
-| 004 |      |        |        |       |       |         |         |         |         |         |          | X           |      |         |       |       |       |       |       |       |       | X      |      |    |
-+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+
-| 005 |      |        |        |       |       |         |         |         |         |         |          | X           | X    |         | X     |       |       |       |       |       |       |        |      |    |
-+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+
-| 006 |      |        |        |       |       |         |         |         |         |         |          | X           | X    |         |       | X     |       |       |       |       |       |        |      |    |
-+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+
-| 007 |      |        |        |       |       |         |         |         |         |         |          | X           | X    |         |       |       | X     |       |       |       |       |        |      |    |
-+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+
-| 008 |      |        |        |       |       |         |         |         |         |         |          | X           | X    |         |       |       |       | X     |       |       |       |        |      |    |
-+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+
-| 009 |      |        |        |       |       |         |         |         |         |         |          |             | X    |         |       |       |       |       | X     | X     |       |        |      |    |
-+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+
-| 010 |      |        |        |       |       |         |         |         |         | X       |          |             |      | X       |       |       |       |       |       |       |       | X      |      |    |
-+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+
-| 011 |      |        |        |       |       |         |         |         |         |         | X        |             | X    |         |       |       |       |       |       |       |       | X      |      |    |
-+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+
-| 012 |      |        |        |       |       |         |         |         |         |         | X        |             |      |         | X     |       |       |       |       |       |       | X      |      |    |
-+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+
-| 013 |      |        |        |       |       |         |         |         |         |         | X        |             |      |         |       | X     |       |       |       |       |       | X      |      |    |
-+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+
-| 014 |      |        |        |       |       |         |         |         |         |         | X        |             |      |         |       |       | X     |       |       |       |       | X      |      |    |
-+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+
-| 015 |      |        |        |       |       |         |         |         |         |         | X        |             |      |         |       |       |       | X     |       |       |       | X      |      |    |
-+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+
-| 016 |      |        |        |       |       |         |         |         |         | X       |          |             |      |         | X     |       |       |       |       |       |       | X      |      |    |
-+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+
-| 017 |      |        |        |       |       |         |         |         |         | X       |          |             |      |         |       | X     |       |       |       |       |       | X      |      |    |
-+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+
-| 018 |      |        |        |       |       |         |         |         |         | X       |          |             |      |         |       |       | X     |       |       |       |       | X      |      |    |
-+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+
-| 019 |      |        |        |       |       |         |         |         |         | X       |          |             |      |         |       |       |       | X     |       |       |       | X      |      |    |
-+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+
-| 020 |      |        |        |       |       |         |         |         |         |         |          |             |      | X       |       |       |       |       |       |       |       | X      |      |    |
-+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+
-| 021 |      | X      | X      |       | X     |         | X       |         |         |         |          |             |      | X       |       |       |       |       |       |       |       |        |      |    |
-+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+
-| 022 |      | X      |        |       |       |         | X       |         |         | X       |          |             | X    |         |       |       |       |       |       |       |       | X      |      |    |
-+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+
-| 024 | X    | X      |        |       | X     |         | X       |         |         |         |          |             | X    |         |       |       |       |       |       |       |       |        | X    |    |
-+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+
-| 025 |      | X      | X      |       | X     |         | X       |         |         |         |          |             | X    |         |       |       |       |       |       |       |       |        |      | X  |
-+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+
-| 026 |      |        |        |       |       |         |         |         |         | X       |          |             |      |         |       |       |       |       |       | X     |       |        |      |    |
-+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+
-| 027 |      |        |        |       |       |         |         |         | X       |         |          |             |      |         |       |       |       |       |       |       |       |        |      |    |
-+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+
-| 028 |      |        |        |       |       |         |         |         |         |         |          |             | X    |         |       |       |       |       |       |       | X     |        |      |    |
-+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+
-+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+-------+------+----+
-| 031 |      |        |        |       |       |         |         |         |         |         |          | X    |         |       |       |       |       |       |       |       | X     |       |      |    |
-+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+-------+------+----+
++-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
+|  FS | ipv6 | SSL UC | SSL OC | NI SN | NI MN | NI BOND | introsp | UC idem | cont UC | cont OC | cont upg | validations | ping | tempest | sc001 | sc002 | sc003 | sc004 | sc005 | sc006 | sc007 | sc008 |nonha   | ceph | HA | HC |
++=====+======+========+========+=======+=======+=========+=========+=========+=========+=========+==========+=============+======+=========+=======+=======+=======+=======+=======+=======+=======+=======+========+======+====+====+
+| 001 |      | X      | X      |       | X     |         | X       |         |         |         |          |             | X    |         |       |       |       |       |       |       |       |       |        |      |    |    |
++-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
+| 002 |      | X      | X      |       | X     |         | X       |         |         |         |          |             | X    |         |       |       |       |       |       |       |       |       |        |      |    |    |
++-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
+| 003 |      |        |        |       |       |         |         | X       |         |         |          |             |      |         |       |       |       |       |       |       |       |       |        |      |    |    |
++-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
+| 004 |      |        |        |       |       |         |         |         |         |         |          | X           |      |         |       |       |       |       |       |       |       |       | X      |      |    |    |
++-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
+| 005 |      |        |        |       |       |         |         |         |         |         |          | X           | X    |         | X     |       |       |       |       |       |       |       |        |      |    |    |
++-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
+| 006 |      |        |        |       |       |         |         |         |         |         |          | X           | X    |         |       | X     |       |       |       |       |       |       |        |      |    |    |
++-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
+| 007 |      |        |        |       |       |         |         |         |         |         |          | X           | X    |         |       |       | X     |       |       |       |       |       |        |      |    |    |
++-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
+| 008 |      |        |        |       |       |         |         |         |         |         |          | X           | X    |         |       |       |       | X     |       |       |       |       |        |      |    |    |
++-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
+| 009 |      |        |        |       |       |         |         |         |         |         |          |             | X    |         |       |       |       |       | X     | X     |       |       |        |      |    |    |
++-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
+| 010 |      |        |        |       |       |         |         |         |         | X       |          |             |      | X       |       |       |       |       |       |       |       |       | X      |      |    |    |
++-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
+| 011 |      |        |        |       |       |         |         |         |         |         | X        |             | X    |         |       |       |       |       |       |       |       |       | X      |      |    |    |
++-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
+| 012 |      |        |        |       |       |         |         |         |         |         | X        |             |      |         | X     |       |       |       |       |       |       |       | X      |      |    |    |
++-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
+| 013 |      |        |        |       |       |         |         |         |         |         | X        |             |      |         |       | X     |       |       |       |       |       |       | X      |      |    |    |
++-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
+| 014 |      |        |        |       |       |         |         |         |         |         | X        |             |      |         |       |       | X     |       |       |       |       |       | X      |      |    |    |
++-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
+| 015 |      |        |        |       |       |         |         |         |         |         | X        |             |      |         |       |       |       | X     |       |       |       |       | X      |      |    |    |
++-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
+| 016 |      |        |        |       |       |         |         |         |         | X       |          |             |      |         | X     |       |       |       |       |       |       |       | X      |      |    |    |
++-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
+| 017 |      |        |        |       |       |         |         |         |         | X       |          |             |      |         |       | X     |       |       |       |       |       |       | X      |      |    |    |
++-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
+| 018 |      |        |        |       |       |         |         |         |         | X       |          |             |      |         |       |       | X     |       |       |       |       |       | X      |      |    |    |
++-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
+| 019 |      |        |        |       |       |         |         |         |         | X       |          |             |      |         |       |       |       | X     |       |       |       |       | X      |      |    |    |
++-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
+| 020 |      |        |        |       |       |         |         |         |         |         |          |             |      | X       |       |       |       |       |       |       |       |       | X      |      |    |    |
++-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
+| 021 |      | X      | X      |       | X     |         | X       |         |         |         |          |             |      | X       |       |       |       |       |       |       |       |       |        |      |    |    |
++-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
+| 022 |      | X      |        |       |       |         | X       |         |         | X       |          |             | X    |         |       |       |       |       |       |       |       |       | X      |      |    |    |
++-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
+| 024 | X    | X      |        |       | X     |         | X       |         |         |         |          |             | X    |         |       |       |       |       |       |       |       |       |        | X    |    |    |
++-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
+| 025 |      | X      | X      |       | X     |         | X       |         |         |         |          |             | X    |         |       |       |       |       |       |       |       |       |        |      |    | X  |
++-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
+| 026 |      |        |        |       |       |         |         |         |         | X       |          |             |      |         |       |       |       |       |       | X     |       |       |        |      |    |    |
++-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
+| 027 |      |        |        |       |       |         |         |         | X       |         |          |             |      |         |       |       |       |       |       |       |       |       |        |      |    |    |
++-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
+| 028 |      |        |        |       |       |         |         |         |         |         |          |             | X    |         |       |       |       |       |       |       | X     |       |        |      |    |    |
++-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
+| 031 |      |        |        |       |       |         |         |         |         |         |          |             | X    |         |       |       |       |       |       |       |       | X     |        |      |    |    |
++-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
+| 032 |      |        |        |       |       |         |         |         |         |         |          |             | X    |         |       |       |       |       |       |       |       |       |        |      | X  |    |
++-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
 
 Definition of Terms:
 
@@ -106,5 +107,7 @@ Definition of Terms:
 +--------------+-------------------------------------------------------------------+
 | sc<number>   | scenario                                                          |
 +--------------+-------------------------------------------------------------------+
+| HA           | Multiple controllers with pacemaker enabled                       |
++--------------+-------------------------------------------------------------------+
 | HC           | Heat Convergence is enabled                                       |
 +--------------+-------------------------------------------------------------------+