From 56d64a2e5b25d9cd7e6c40a17b2c7832eafdff89 Mon Sep 17 00:00:00 2001
From: Numan Siddique <nusiddiq@redhat.com>
Date: Mon, 24 Jul 2017 10:12:56 +0530
Subject: [PATCH] Add fset030 for OVN with containerized oc

featureset028 was added recently to have OVN baremetal services. This patch
adds featureset030 for containerized OVN services.

Partial-bug: #1699085
Change-Id: Idc027e41d0e98eebe134be4c0909c4165eb8e83d
---
 config/general_config/featureset030.yml | 37 +++++++++++++++++++++++++
 doc/source/feature-configuration.rst    |  2 ++
 2 files changed, 39 insertions(+)
 create mode 100644 config/general_config/featureset030.yml

diff --git a/config/general_config/featureset030.yml b/config/general_config/featureset030.yml
new file mode 100644
index 000000000..4abe67c86
--- /dev/null
+++ b/config/general_config/featureset030.yml
@@ -0,0 +1,37 @@
+# Summary of the feature set.
+# Deploy an Openstack environment with OVN configured in the containerized overcloud
+deploy_composable_scenario: true
+composable_scenario: scenario007-multinode-containers.yaml
+validate_template: scenario007-multinode.yaml
+
+network_isolation: false
+enable_pacemaker: false
+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
+
+# This featureset is extremely resource intensive, so we disable telemetry
+# in order to reduce the overall memory footprint
+# This is not required in newton
+telemetry_args: >-
+   {% if release != 'newton' %}
+   -e {{ overcloud_templates_path }}/environments/disable-telemetry.yaml
+   {% endif %}
+
+# TODO(numans) - Change to neutron-ml2-ovn-ha.yaml once OVN bundle pacemaker support
+# is ready.
+extra_args: >-
+  --ntp-server pool.ntp.org
+  -e {{ overcloud_templates_path }}/environments/services-docker/neutron-ovn.yaml
+
+# If `run_tempest` is `true`, run tempests tests, otherwise do not
+# run them.
+tempest_config: false
+test_ping: true
+run_tempest: false
diff --git a/doc/source/feature-configuration.rst b/doc/source/feature-configuration.rst
index 3678b7e6a..ee65b2378 100644
--- a/doc/source/feature-configuration.rst
+++ b/doc/source/feature-configuration.rst
@@ -75,6 +75,8 @@ please consult the following `etherpad <https://etherpad.openstack.org/p/quickst
 +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
 | 028 |      |        |        |       |       |         |         |         |         |         |          |             | X    |         |       |       |       |       |       |       | X     |       |        |      |    |    |
 +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
+| 030 |      |        |        |       |       |         |         |         |         | X       |          |             | X    |         |       |       |       |       |       |       | X     |       |        |      |    |    |
++-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
 | 031 |      |        |        |       |       |         |         |         |         |         |          |             | X    |         |       |       |       |       |       |       |       | X     |        |      |    |    |
 +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
 | 032 |      |        |        |       |       |         |         |         |         |         |          |             | X    |         |       |       |       |       |       |       |       |       |        |      | X  |    |