From 7f1314a49d236b3719f57c5659c3c1f714bb2909 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Fri, 31 Aug 2018 11:25:09 +0200 Subject: [PATCH] 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 --- config/general_config/featureset026.yml | 4 ++++ config/general_config/featureset033.yml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/config/general_config/featureset026.yml b/config/general_config/featureset026.yml index 71af7bb2a..20af93440 100644 --- a/config/general_config/featureset026.yml +++ b/config/general_config/featureset026.yml @@ -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: >- diff --git a/config/general_config/featureset033.yml b/config/general_config/featureset033.yml index eceb4ad65..2264d3004 100644 --- a/config/general_config/featureset033.yml +++ b/config/general_config/featureset033.yml @@ -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 }}