From 690ecb8ca4618eba97eda435c1e778274d189903 Mon Sep 17 00:00:00 2001
From: Major Hayden <major@mhtx.net>
Date: Fri, 18 Aug 2017 10:06:24 -0500
Subject: [PATCH] Allow override of RDO repo baseurl

This patch allows deployers to set openstack_hosts_centos_mirror_url
and override the default RDO repository (mirrors.centos.org).

Change-Id: I81d89299541211556bd76794a82475f3879fa297
---
 defaults/main.yml                              |  4 ++++
 ...s-mirror-url-variable-c072a6ab21054093.yaml |  5 +++++
 tasks/openstack_host_install_yum.yml           | 18 ++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 releasenotes/notes/centos-mirror-url-variable-c072a6ab21054093.yaml

diff --git a/defaults/main.yml b/defaults/main.yml
index da1f4d7f..8e2448fd 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -103,3 +103,7 @@ openstack_domain: openstack.local
 
 # Global environment variables should be empty by default
 global_environment_variables: {}
+
+# Set default mirror for CentOS repositories
+# NOTE(mhayden): Ensure that the full path to the 'centos' directory is used.
+#openstack_hosts_centos_mirror_url: 'http://mirror.centos.org/centos'
diff --git a/releasenotes/notes/centos-mirror-url-variable-c072a6ab21054093.yaml b/releasenotes/notes/centos-mirror-url-variable-c072a6ab21054093.yaml
new file mode 100644
index 00000000..aa360c67
--- /dev/null
+++ b/releasenotes/notes/centos-mirror-url-variable-c072a6ab21054093.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Deployers can set ``openstack_hosts_centos_mirror_url`` to use their
+    preferred mirror for the RDO repositories.
diff --git a/tasks/openstack_host_install_yum.yml b/tasks/openstack_host_install_yum.yml
index bf9f6b40..1370126c 100644
--- a/tasks/openstack_host_install_yum.yml
+++ b/tasks/openstack_host_install_yum.yml
@@ -34,6 +34,24 @@
     - openstack-yum-packages
     - openstack-packages
 
+- name: Ensure RDO repositories are using the correct CentOS mirror
+  command: |
+    yum-config-manager
+      --save
+      --setopt="{{ item.repo_name }}.baseurl={{ item.baseurl }}"
+  changed_when: false
+  with_items:
+    - repo_name: rdo-qemu-ev
+      baseurl: "{{ openstack_hosts_centos_mirror_url }}/7/virt/$basearch/kvm-common/"
+    - repo_name: openstack-ocata
+      baseurl: "{{ openstack_hosts_centos_mirror_url }}/7/cloud/$basearch/openstack-ocata/"
+  when:
+    - user_external_repo_key is not defined
+    - openstack_hosts_centos_mirror_url is defined
+  tags:
+    - add-repo-keys
+
+
 - name: Install EPEL, and yum priorities plugin
   package:
     name: "{{ item }}"