Merge "Default environment/services/* to docker"

2018-04-07 00:39:51 +00:00 · 2018-04-07 00:39:51 +00:00 · f844fc3f97
parent 1c66868ea5 782a693a22
commit f844fc3f97
1 changed files with 4 additions and 0 deletions
--- 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.