From 7a5701d14f9bf5dc5f10b8fd78c4bb3f7f775b3a Mon Sep 17 00:00:00 2001
From: Dougal Matthews <dougal@redhat.com>
Date: Tue, 28 Nov 2017 11:37:29 +0000
Subject: [PATCH] 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
---
 .../overcloud-deploy/templates/overcloud-deploy-post.sh.j2  | 6 ------
 roles/validate-simple/defaults/main.yml                     | 4 ----
 roles/validate-tempest/templates/configure-tempest.sh.j2    | 4 ----
 3 files changed, 14 deletions(-)

diff --git a/roles/overcloud-deploy/templates/overcloud-deploy-post.sh.j2 b/roles/overcloud-deploy/templates/overcloud-deploy-post.sh.j2
index e8a54b30f..116b991d2 100644
--- a/roles/overcloud-deploy/templates/overcloud-deploy-post.sh.j2
+++ b/roles/overcloud-deploy/templates/overcloud-deploy-post.sh.j2
@@ -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.
 ## ::
diff --git a/roles/validate-simple/defaults/main.yml b/roles/validate-simple/defaults/main.yml
index 9b8981913..3dddc0676 100644
--- a/roles/validate-simple/defaults/main.yml
+++ b/roles/validate-simple/defaults/main.yml
@@ -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
diff --git a/roles/validate-tempest/templates/configure-tempest.sh.j2 b/roles/validate-tempest/templates/configure-tempest.sh.j2
index eb87ad5c5..17c14e332 100644
--- a/roles/validate-tempest/templates/configure-tempest.sh.j2
+++ b/roles/validate-tempest/templates/configure-tempest.sh.j2
@@ -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
 ## ::