Removed the release check from the pre-deploy task.

The pre-deploy task generates the containers-prepare-parameters.yaml
file according to the selected release to deploy.
Since the create-script in the undercloud section always
create the containers-prepare-parameter.yaml file, the check
on the overcloud-deploy role is not necessary anymore.

Change-Id: Ia94faa143fe9b572bf006ec9255dcb075c075924
Closes-Bug: #1817612
This commit is contained in:
fpantano
2019-02-25 20:00:08 +01:00
parent 7269b3c2f7
commit 4bf4adedfc

View File

@@ -190,11 +190,7 @@
{% if enable_pacemaker|bool or osp_release is defined%}
-e {{ overcloud_templates_path }}/environments/docker-ha.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 %}
{% if release not in ['pike', 'queens', 'rocky'] %}
-e {{ overcloud_templates_path }}/environments/{{ overcloud_container_cli | default('docker') }}.yaml
{% endif %}