From 1cecdcc54b3549817a41f1bd32be6920c6bb427f Mon Sep 17 00:00:00 2001
From: yatin <ykarel@redhat.com>
Date: Mon, 11 Jun 2018 17:41:20 +0530
Subject: [PATCH] Fix yum contentdir var for non altarch

Review https://review.openstack.org/#/c/568701/ created
contentdir file, but it's not working where file is not
present.
This patch fixes it for non altarch when file: contentdir
is not present on host.

Also change the fact name to yum_contentdir_data as
yum_contentdir conflicts with the when condition.

Change-Id: I99c095ab0da0cf969f0b7a1b3af890cc89c65454
---
 roles/nodepool-setup/tasks/main.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/roles/nodepool-setup/tasks/main.yml b/roles/nodepool-setup/tasks/main.yml
index d3c388930..ed3d0d585 100644
--- a/roles/nodepool-setup/tasks/main.yml
+++ b/roles/nodepool-setup/tasks/main.yml
@@ -42,13 +42,18 @@
 
   - name: Set contentdir to altarch
     set_fact:
-      yum_contentdir: altarch
+      yum_contentdir_data: altarch
     when: rpm_arch.stdout in ['aarch64', 'ppc64le']
 
+  - name: Set contentdir to default centos arch
+    set_fact:
+      yum_contentdir_data: centos
+    when: rpm_arch.stdout not in ['aarch64', 'ppc64le']
+
   - name: Populate /etc/yum/vars/contentdir
     copy:
       dest: /etc/yum/vars/contentdir
-      content: "{{ yum_contentdir|default('centos') }}"
+      content: "{{ yum_contentdir_data }}"
     become: true
 
 - name: Install repos (will be removed by toci_gatetest)