From ca6b01ba8e89318724a4ea830af954844aaf8764 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Wed, 10 Jan 2018 11:58:42 -0800
Subject: [PATCH] Containerize featureset032 (multinode-3nodes)

... and also run Tempest like other jobs

Change-Id: I787eef42db98e1524e1cb9742cd3e097adcacfa9
Depends-On: I31e1fe29491d2cbaa8ed9cd35ee84bbb1d455154
---
 config/general_config/featureset032.yml | 30 +++++++++++++++----------
 doc/source/feature-configuration.rst    |  2 +-
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/config/general_config/featureset032.yml b/config/general_config/featureset032.yml
index 3362ef7d2..89efcda4b 100644
--- a/config/general_config/featureset032.yml
+++ b/config/general_config/featureset032.yml
@@ -1,17 +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
-composable_scenario: ""
-upgrade_composable_scenario: ""
 composable_services: false
-composable_roles: false
 
-composable_args: ""
+network_isolation: false
+enable_pacemaker: true
+overcloud_ipv6: false
+containerized_overcloud: true
+
+# This enables TLS for the undercloud which will also make haproxy bind to the
+# configured public-vip and admin-vip.
+undercloud_generate_service_certificate: false
+
+# This enables the deployment of the overcloud with SSL.
+ssl_overcloud: false
+
+# If `run_tempest` is `true`, run tempests tests, otherwise do not
+# run them.
+test_ping: false
+run_tempest: true
+test_regex: 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
+composable_roles: false
 
 # 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
@@ -23,5 +31,3 @@ multinode_args: >-
     -r {{ overcloud_templates_path }}/ci/environments/multinode-3nodes.yaml
     -e {{ overcloud_templates_path }}/environments/deployed-server-bootstrap-environment-centos.yaml
     --overcloud-ssh-user {{ undercloud_user }}
-enable_pacemaker: true
-
diff --git a/doc/source/feature-configuration.rst b/doc/source/feature-configuration.rst
index ab25be9c7..b0ae23b8d 100644
--- a/doc/source/feature-configuration.rst
+++ b/doc/source/feature-configuration.rst
@@ -79,7 +79,7 @@ please consult the following `etherpad <https://etherpad.openstack.org/p/quickst
 +-----+--------+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
 | 031 |        |      |        |        |       |       |         |         |         |         |         |          |             | X    |         |       |       |       |       |       |       |       | X     |        |      |    |    |
 +-----+--------+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
-| 032 |        |      |        |        |       |       |         |         |         |         |         |          |             |      |         |       |       |       |       |       |       |       |       |        |      | X  |    |
+| 032 |        |      |        |        |       |       |         |         |         |         |    X    |          |             |      |         |       |       |       |       |       |       |       |       |        |      | X  |    |
 +-----+--------+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
 | 033 |        |      |        |        |       |       |         |         |         |         | X       |          |             |      |         |       |       |       |       |       | X     |       |       |        |      |    |    |
 +-----+--------+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+