Always use overcloudrc, it is now v3 by default

The v3 file is going to be removed as it is no longer needed.

Related-Bug: #1733640
Needed-By: I3612c58c356f8955bd44655cf5aacc20be532cbc
Change-Id: I5e779f48a02c5389cebf84e9d3899250d63cace8
This commit is contained in:
Dougal Matthews 2017-11-28 11:37:29 +00:00
parent ac1d2ca3b4
commit 7a5701d14f
3 changed files with 0 additions and 14 deletions

View File

@ -38,13 +38,7 @@ EOF
## * Source in the overcloud credentials.
## ::
## clean that up once https://bugs.launchpad.net/tripleo/+bug/1727454 is fixed
## in tripleo-common
{% if release in ['newton','ocata', 'pike'] %}
. {{ working_dir }}/overcloudrc
{% else %}
. {{ working_dir }}/overcloudrc.v3
{% endif %}
## * Create the `heat_stack_owner` role if it doesn't already exist.
## ::

View File

@ -1,9 +1,5 @@
tenantrc: >-
{% if release in ['newton', 'ocata', 'pike'] -%}
overcloudrc
{%- else -%}
overcloudrc.v3
{%- endif -%}
validate_script: overcloud-validate.sh.j2
validate_template_path: /usr/share/openstack-tripleo-heat-templates/ci/pingtests
validate_template: tenantvm_floatingip.yaml

View File

@ -5,11 +5,7 @@
{% if tempest_overcloud|bool %}
## ::
{% if release in ['newton', 'ocata', 'pike'] %}
source {{ working_dir }}/overcloudrc
{% else %}
source {{ working_dir }}/overcloudrc.v3
{% endif %}
## * Clean up from any previous tempest run
## ::