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
commit def233448d
1 changed files with 2 additions and 2 deletions
Show Stats 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 %}
-e {{ working_dir }}/containers-prepare-parameter.yaml
{% endif %}
{% if release not in ['pike', 'queens', 'rocky'] and overcloud_container_cli == 'podman' %}
-e {{ overcloud_templates_path }}/environments/podman.yaml
{% if release not in ['pike', 'queens', 'rocky'] %}
-e {{ overcloud_templates_path }}/environments/{{ overcloud_container_cli | default('docker') }}.yaml
{% endif %}
when:
- containerized_overcloud|bool