Remove explicit --config-download
Now that config-download is the default across tripleoclient and tripleo-heat-templates, we can update all the CI jobs to remove the explicit --config-download and -e environments/config-download-environment.yaml. Note that --deployed-server didn't actually trigger any needed behaviors with --config-download, so where it was used, it has now been removed as well. Change-Id: Ic5c5df350a7eb5291d45cf8e229af575fe9bed57
This commit is contained in:
parent
d45bdd1b91
commit
99a6d31a45
|
@ -135,9 +135,3 @@ deploy_steps_ansible_workflow: >-
|
|||
{%- else -%}
|
||||
false
|
||||
{%- endif -%}
|
||||
config_download_args: >-
|
||||
{% if release not in ['newton','ocata','pike'] -%}
|
||||
-e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
|
||||
--config-download
|
||||
--verbose
|
||||
{%- endif -%}
|
||||
|
|
|
@ -94,9 +94,3 @@ deploy_steps_ansible_workflow: >-
|
|||
{%- else -%}
|
||||
false
|
||||
{%- endif -%}
|
||||
config_download_args: >-
|
||||
{% if release not in ['newton','ocata','pike','queens'] -%}
|
||||
-e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
|
||||
--config-download
|
||||
--verbose
|
||||
{%- endif -%}
|
||||
|
|
|
@ -54,10 +54,7 @@ deploy_steps_ansible_workflow: >-
|
|||
{%- endif -%}
|
||||
config_download_args: >-
|
||||
{% if release not in ['newton','ocata','pike'] -%}
|
||||
-e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
|
||||
-e {{ working_dir }}/config-download.yaml
|
||||
--config-download
|
||||
--deployed-server
|
||||
--disable-validations
|
||||
--verbose
|
||||
{%- endif -%}
|
||||
|
|
|
@ -124,10 +124,7 @@ deploy_steps_ansible_workflow: >-
|
|||
{%- endif -%}
|
||||
config_download_args: >-
|
||||
{% if release not in ['newton','ocata','pike','queens'] -%}
|
||||
-e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
|
||||
-e {{ working_dir }}/config-download.yaml
|
||||
--config-download
|
||||
--deployed-server
|
||||
--disable-validations
|
||||
--verbose
|
||||
{%- endif -%}
|
||||
|
|
|
@ -134,10 +134,7 @@ deploy_steps_ansible_workflow: >-
|
|||
{%- endif -%}
|
||||
config_download_args: >-
|
||||
{% if release not in ['newton','ocata','pike','queens'] -%}
|
||||
-e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
|
||||
-e {{ working_dir }}/config-download.yaml
|
||||
--config-download
|
||||
--deployed-server
|
||||
--disable-validations
|
||||
--verbose
|
||||
{%- endif -%}
|
||||
|
|
|
@ -108,10 +108,7 @@ deploy_steps_ansible_workflow: >-
|
|||
{%- endif -%}
|
||||
config_download_args: >-
|
||||
{% if release not in ['newton','ocata','pike','queens'] -%}
|
||||
-e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
|
||||
-e {{ working_dir }}/config-download.yaml
|
||||
--config-download
|
||||
--deployed-server
|
||||
--disable-validations
|
||||
--verbose
|
||||
{%- endif -%}
|
||||
|
|
|
@ -70,9 +70,3 @@ deploy_steps_ansible_workflow: >-
|
|||
{%- else -%}
|
||||
false
|
||||
{%- endif -%}
|
||||
config_download_args: >-
|
||||
{% if release not in ['newton','ocata','pike','queens'] -%}
|
||||
-e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
|
||||
--config-download
|
||||
--verbose
|
||||
{%- endif -%}
|
||||
|
|
|
@ -24,10 +24,7 @@ container_args: >-
|
|||
-e {{ overcloud_templates_path }}/environments/kubernetes.yaml
|
||||
|
||||
config_download_args: >-
|
||||
-e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
|
||||
-e {{ working_dir }}/config-download.yaml
|
||||
--config-download
|
||||
--deployed-server
|
||||
--disable-validations
|
||||
--verbose
|
||||
|
||||
|
|
|
@ -57,10 +57,7 @@ deploy_steps_ansible_workflow: >-
|
|||
{%- endif -%}
|
||||
config_download_args: >-
|
||||
{% if release not in ['newton','ocata','pike','queens'] -%}
|
||||
-e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
|
||||
-e {{ working_dir }}/config-download.yaml
|
||||
--config-download
|
||||
--deployed-server
|
||||
--disable-validations
|
||||
--verbose
|
||||
{%- endif -%}
|
||||
|
|
|
@ -40,10 +40,7 @@ deploy_steps_ansible_workflow: >-
|
|||
{%- endif -%}
|
||||
config_download_args: >-
|
||||
{% if release not in ['newton','ocata','pike'] -%}
|
||||
-e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
|
||||
-e {{ working_dir }}/config-download.yaml
|
||||
--config-download
|
||||
--deployed-server
|
||||
--disable-validations
|
||||
--verbose
|
||||
{%- endif -%}
|
||||
|
|
|
@ -30,10 +30,7 @@ container_args: >-
|
|||
|
||||
deploy_steps_ansible_workflow: true
|
||||
config_download_args: >-
|
||||
-e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
|
||||
-e {{ working_dir }}/config-download.yaml
|
||||
--config-download
|
||||
--deployed-server
|
||||
--disable-validations
|
||||
--verbose
|
||||
|
||||
|
|
|
@ -72,9 +72,3 @@ deploy_steps_ansible_workflow: >-
|
|||
{%- else -%}
|
||||
false
|
||||
{%- endif -%}
|
||||
config_download_args: >-
|
||||
{% if release not in ['newton','ocata','pike','queens'] -%}
|
||||
-e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
|
||||
--config-download
|
||||
--verbose
|
||||
{%- endif -%}
|
||||
|
|
|
@ -53,10 +53,7 @@ overcloud_roles:
|
|||
deploy_steps_ansible_workflow: true
|
||||
config_download_args: >-
|
||||
{% if release not in ['newton','ocata','pike'] -%}
|
||||
-e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
|
||||
-e {{ working_dir }}/config-download.yaml
|
||||
--config-download
|
||||
--deployed-server
|
||||
--disable-validations
|
||||
--verbose
|
||||
{%- endif -%}
|
||||
|
|
|
@ -68,7 +68,3 @@ tempest_whitelist:
|
|||
- 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
|
||||
|
||||
deploy_steps_ansible_workflow: true
|
||||
config_download_args: >-
|
||||
-e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
|
||||
--config-download
|
||||
--verbose
|
||||
|
|
|
@ -89,9 +89,3 @@ deploy_steps_ansible_workflow: >-
|
|||
{%- else -%}
|
||||
false
|
||||
{%- endif -%}
|
||||
config_download_args: >-
|
||||
{% if release not in ['newton','ocata','pike'] -%}
|
||||
-e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
|
||||
--config-download
|
||||
--verbose
|
||||
{%- endif -%}
|
||||
|
|
|
@ -95,9 +95,3 @@ deploy_steps_ansible_workflow: >-
|
|||
{%- else -%}
|
||||
false
|
||||
{%- endif -%}
|
||||
config_download_args: >-
|
||||
{% if release not in ['newton','ocata','pike'] -%}
|
||||
-e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
|
||||
--config-download
|
||||
--verbose
|
||||
{%- endif -%}
|
||||
|
|
Loading…
Reference in New Issue