Merge "Always use overcloudrc, it is now v3 by default"

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.
 ## ::

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

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
 ## ::