openstack
/
tripleo-quickstart
Code Issues Proposed changes

Merge "Switch featuresets to workflow driven image prepare"

This commit is contained in:
Zuul 2018-09-05 11:58:24 +00:00 committed by Gerrit Code Review
parent 514e1e88e7 7f1314a49d
commit b729352fa8
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/general_config/featureset026.yml
View File

@ -19,7 +19,11 @@ container_args: >-
{% if release in ['pike','queens'] -%}
-e {{ overcloud_templates_path }}/environments/docker.yaml
{%- endif -%}
{% if release in ['ocata', 'pike', 'queens', 'rocky'] %}
-e {{ working_dir }}/containers-default-parameters.yaml
{% else %}
-e {{ working_dir }}/containers-prepare-parameter.yaml
{% endif %}
-e {{ overcloud_templates_path }}/environments/kubernetes.yaml
config_download_args: >-

4
config/general_config/featureset033.yml
View File

@ -26,7 +26,11 @@ container_args: >-
{% if release in ['pike','queens'] -%}
-e {{ overcloud_templates_path }}/environments/docker.yaml
{%- endif -%}
{% if release in ['ocata', 'pike', 'queens', 'rocky'] %}
-e {{ working_dir }}/containers-default-parameters.yaml
{% else %}
-e {{ working_dir }}/containers-prepare-parameter.yaml
{% endif %}
-e {{ overcloud_templates_path }}/environments/openshift.yaml
docker_openshift_etcd_namespace: docker.io/{{ docker_registry_namespace }}