openstack
/
tripleo-quickstart
Code Issues Proposed changes

Remove docker.yaml environment from featuresets 26 and 33 

It is now the default, so no need to add it.

Change-Id: Idf46739cbd45cfbce8f49318050be9d5285dc235
Depends-On: I373fef6581dfbfa365479f88d7b967cfbed446e4
This commit is contained in:
Juan Antonio Osorio Robles 2018-03-05 13:56:06 +02:00
parent b10dbd4f7a
commit 5961e227a9
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/general_config/featureset026.yml
View File

@ -17,7 +17,9 @@ extra_args: >-
--ntp-server pool.ntp.org
container_args: >-
{% if release in ['pike','queens'] -%}
-e {{ overcloud_templates_path }}/environments/docker.yaml
{%- endif -%}
-e {{ working_dir }}/containers-default-parameters.yaml
-e {{ overcloud_templates_path }}/environments/kubernetes.yaml

2
config/general_config/featureset033.yml
View File

@ -22,7 +22,9 @@ extra_args: >-
--ntp-server pool.ntp.org
container_args: >-
{% if release in ['pike','queens'] -%}
-e {{ overcloud_templates_path }}/environments/docker.yaml
{%- endif -%}
-e {{ working_dir }}/containers-default-parameters.yaml
-e {{ overcloud_templates_path }}/environments/openshift.yaml