openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Merge "overcloud/deploy: use overcloud_container_cli to find out which env to load"

Browse Source
This commit is contained in:
Zuul
2019-02-15 08:31:21 +00:00
committed by Gerrit Code Review
parent 89f57feb36 3806641b7d
commit def233448d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/overcloud-deploy/tasks/pre-deploy.yml
View File

@@ -195,8 +195,8 @@
{% else %} {% else %}
-e {{ working_dir }}/containers-prepare-parameter.yaml -e {{ working_dir }}/containers-prepare-parameter.yaml
{% endif %} {% endif %}
{% if release not in ['pike', 'queens', 'rocky'] and overcloud_container_cli == 'podman' %} {% if release not in ['pike', 'queens', 'rocky'] %}
-e {{ overcloud_templates_path }}/environments/podman.yaml -e {{ overcloud_templates_path }}/environments/{{ overcloud_container_cli | default('docker') }}.yaml
{% endif %} {% endif %}
when: when:
- containerized_overcloud|bool - containerized_overcloud|bool