From 8b90e038e95541de25e6695db0e241615be0b17d Mon Sep 17 00:00:00 2001
From: Mohammed Naser <mnaser@vexxhost.com>
Date: Wed, 15 Aug 2018 14:33:33 -0400
Subject: [PATCH] Use variable with full URL for RDO repositories

It is possible that we catch the RDO mirrors inside OpenStack
in an inconsistent state because the `latest` URL changed and
the metadata is still cached in infra

This patch moves those mirror URLs to seperate variables so
that we can override them later.

Change-Id: Id5281e8f3c2453de12d0ec51b58636433e4e8d84
---
 defaults/main.yml | 2 ++
 vars/redhat-7.yml | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index c37a7244..821e97ac 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -138,6 +138,8 @@ openstack_host_sysstat_cron_mode: '0755'
 # NOTE(mhayden): Ensure that the full path to the 'centos' directory is used.
 openstack_hosts_centos_mirror_url: 'http://mirror.centos.org/centos'
 openstack_hosts_rdo_mirror_url: 'https://trunk.rdoproject.org'
+openstack_hosts_rdo_repo_url: "{{ openstack_hosts_rdo_mirror_url }}/centos7-master/current-passed-ci/"
+openstack_hosts_rdo_deps_url: "{{ openstack_hosts_rdo_mirror_url }}/centos7-master/deps/latest/"
 # Ubuntu cloud archive data
 uca_repo: "{{ _uca_repo }}"
 
diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index 59dd2f45..8e9043f7 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -116,10 +116,10 @@ _package_repos:
   - name: rdo-current-passed-ci
     file: rdo
     description: rdo-current-passed-ci
-    baseurl: "{{ openstack_hosts_rdo_mirror_url }}/centos7-master/current-passed-ci/"
+    baseurl: "{{ openstack_hosts_rdo_repo_url }}"
     gpgcheck: no
   - name: rdo-deps
     file: rdo
     description: rdo-deps
-    baseurl: "{{ openstack_hosts_rdo_mirror_url }}/centos7-master/deps/latest/"
+    baseurl: "{{ openstack_hosts_rdo_deps_url }}"
     gpgcheck: no