Apex: Fix OS credentials fetch

Now that keystone V3 Identity is only one supported, OOO 'overcloudrc'
should be used in Queens and later as that contains V3 creds.
'overcloudrc.v3' will eventually be removed in OOO.

Note, this was causing tempest_smoke_serial to fail in Apex with Swift
test cases. This is due to the fact that in Apex we were only setting
the OS_REGION_NAME in overcloudrc, and functest was using
overcloudrc.v3. When Tempest does not have the region set it will simply
look for the first endpoint it can find for that service type, and was
not using the right keystone endpoint for Apex.

Change-Id: I154c9e762dfc5ba035f6e108606ecedcfb0d60d2
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh
index 4bc5858..b40b75b 100755 (executable)
--- a/utils/fetch_os_creds.sh
+++ b/utils/fetch_os_creds.sh
@@ -164,7 +164,13 @@ elif [ "$installer_type" == "apex" ]; then
     if [ -f /root/.ssh/id_rsa ]; then
         chmod 600 /root/.ssh/id_rsa
     fi
-    sudo scp $ssh_options root@$installer_ip:/home/stack/overcloudrc.v3 $dest_path
+
+    if [ "${BRANCH}" == "stable/fraser" ]; then
+      rc_file=overcloudrc.v3
+    else
+      rc_file=overcloudrc
+    fi
+    sudo scp $ssh_options root@$installer_ip:/home/stack/${rc_file} $dest_path
 
 elif [ "$installer_type" == "compass" ]; then
     if [ "${BRANCH}" == "stable/danube" ]; then