Switch featuresets to workflow driven image prepare

In I006e48754ed1710ae8cc6e9c1d35e9c2e66b5907 we've switched the image
prepare to the mistral driven workflow. We need to include the
containers-prepare-parameter.yaml environment file instead of the
containers-default-paramerters.yaml file.

Change-Id: I547646cc42c361f74e5091ba206b339ecc5f558a
Blueprint: container-prepare-workflow
This commit is contained in:
Martin André 2018-08-31 11:25:09 +02:00
parent b3089c2c74
commit 7f1314a49d
2 changed files with 8 additions and 0 deletions

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: >-

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 }}