From 782a693a22b026d9263348bb66d6d31192d085cd Mon Sep 17 00:00:00 2001
From: Bogdan Dobrelya <bdobreli@redhat.com>
Date: Tue, 27 Mar 2018 11:25:51 +0200
Subject: [PATCH] Default environment/services/* to docker

This updates the relevant environment/services-docker code
for fs030 to default to dockerish environment/services.

Depends-On: I923731f46ea26582160a11d2dfe85792ab74110b

Change-Id: I6922f4b2bba5b92461a784522732c6864380eb86
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
---
 config/general_config/featureset030.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/general_config/featureset030.yml b/config/general_config/featureset030.yml
index ba9900599..f987f0a32 100644
--- a/config/general_config/featureset030.yml
+++ b/config/general_config/featureset030.yml
@@ -28,7 +28,11 @@ telemetry_args: >-
 # is ready.
 extra_args: >-
   --ntp-server pool.ntp.org
+  {% if release in ['pike', 'queens'] -%}
   -e {{ overcloud_templates_path }}/environments/services-docker/neutron-ovn.yaml
+  {%- else -%}
+  -e {{ overcloud_templates_path }}/environments/services/neutron-ovn.yaml
+  {%- endif -%}
 
 # If `run_tempest` is `true`, run tempests tests, otherwise do not
 # run them.