From b2e7a0138c45b5f98629350e9c9b5bbb3ac29361 Mon Sep 17 00:00:00 2001
From: Ronelle Landy <rlandy@redhat.com>
Date: Fri, 21 Feb 2020 12:22:33 -0500
Subject: [PATCH] Use md5sum if baseurl shows up more than once in
 delorean.repo file

Change-Id: I576e16d32213819ddea32d701e358895f7cccb38
---
 roles/build-containers/tasks/main.yaml | 39 +++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/roles/build-containers/tasks/main.yaml b/roles/build-containers/tasks/main.yaml
index 5ce7344bd..82ddfcbaf 100644
--- a/roles/build-containers/tasks/main.yaml
+++ b/roles/build-containers/tasks/main.yaml
@@ -25,18 +25,43 @@
     # NOTE(mjturek): Push old style tag for x86_64 first to maintain compatibility.
     arch_tag: "{{ '_' + ansible_architecture if ansible_architecture != 'x86_64' else ''}}"
 
-- name: Get contents of openstack repo baseurl for the version hash
+- name: Check the contents of the openstack_repo_name repo
   become: true
   shell: >
     set -o pipefail &&
-    cat /etc/yum.repos.d/{{ openstack_repo_name }}.repo |awk -F= '/baseurl/ {print $2}'
-  register: baseurl
+    cat /etc/yum.repos.d/{{ openstack_repo_name }}.repo |grep -o 'baseurl=' |wc -l
+  register: number_baseurl_lines
   when: buildcontainers_version_hash is not defined
 
-- name: Set version_hash fact
-  set_fact:
-    version_hash: "{{ baseurl.stdout.split('/')[-1] }}"
-  when: buildcontainers_version_hash is not defined
+- name: Use baseurl if there is only one
+  when:
+    - buildcontainers_version_hash is not defined
+    - number_baseurl_lines.stdout|int == 1
+  block:
+    - name: Get contents of openstack repo baseurl for the version hash
+      become: true
+      shell: >
+        set -o pipefail &&
+        cat /etc/yum.repos.d/{{ openstack_repo_name }}.repo |awk -F= '/baseurl/ {print $2}'
+      register: baseurl
+
+    - name: Set version_hash fact
+      set_fact:
+        version_hash: "{{ baseurl.stdout.split('/')[-1] }}"
+
+- name: Use the md5sum if there is more than one baseurl line
+  when:
+    - buildcontainers_version_hash is not defined
+    - number_baseurl_lines.stdout|int > 1
+  block:
+    - name: Get contents of openstack repo baseurl for the version hash
+      become: true
+      shell: md5sum /etc/yum.repos.d/{{ openstack_repo_name }}.repo | awk '{print $1}'
+      register: md5sum_repo
+
+    - name: Set version_hash fact
+      set_fact:
+        version_hash: "{{ md5sum_repo.stdout }}"
 
 - name: Set version_hash fact if buildcontainers_version_hash is defined
   set_fact: