From: Loic Dachary <loic@dachary.org>
Date: Sun, 27 Mar 2016 15:32:40 +0000 (+0200)
Subject: replace hardcoded x86_64 with {{ansible_architecture}}
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=74404d3e9f11c62fddb00fcc1616c02d7f520af3;p=ceph-cm-ansible.git

replace hardcoded x86_64 with {{ansible_architecture}}

Signed-off-by: Thierry Delamare <t.delamare@laposte.net>
Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/roles/testnode/vars/centos_7.yml b/roles/testnode/vars/centos_7.yml
index e89d70c..37a0850 100644
--- a/roles/testnode/vars/centos_7.yml
+++ b/roles/testnode/vars/centos_7.yml
@@ -4,7 +4,7 @@
 yum_repos:
   centos7-fcgi-ceph:
     name: CentOS 7 Local fastcgi Repo
-    baseurl: http://gitbuilder.ceph.com/mod_fastcgi-rpm-centos7-x86_64-basic/ref/master/
+    baseurl: http://gitbuilder.ceph.com/mod_fastcgi-rpm-centos7-{{ansible_architecture}}-basic/ref/master/
     enabled: 1
     gpgcheck: 0
     priority: 2
diff --git a/roles/testnode/vars/debian_7.yml b/roles/testnode/vars/debian_7.yml
index 568dd42..8a9e4f9 100644
--- a/roles/testnode/vars/debian_7.yml
+++ b/roles/testnode/vars/debian_7.yml
@@ -1,7 +1,7 @@
 ---
 apt_repos:
   - "deb http://ceph.com/debian-dumpling/ wheezy main"
-  - "deb http://gitbuilder.ceph.com/libapache-mod-fastcgi-deb-wheezy-x86_64-basic/ref/master/ wheezy main"
+  - "deb http://gitbuilder.ceph.com/libapache-mod-fastcgi-deb-wheezy-{{ansible_architecture}}-basic/ref/master/ wheezy main"
 
 packages:
   - lsb-release
diff --git a/roles/testnode/vars/redhat_7.yml b/roles/testnode/vars/redhat_7.yml
index 7005d72..a05b6cd 100644
--- a/roles/testnode/vars/redhat_7.yml
+++ b/roles/testnode/vars/redhat_7.yml
@@ -4,7 +4,7 @@
 common_yum_repos:
   rhel-7-fcgi-ceph:
     name: "RHEL 7 Local fastcgi Repo"
-    baseurl: "http://{{ gitbuilder_host }}/mod_fastcgi-rpm-rhel7-x86_64-basic/ref/master/"
+    baseurl: "http://{{ gitbuilder_host }}/mod_fastcgi-rpm-rhel7-{{ansible_architecture}}-basic/ref/master/"
     enabled: 1
     gpgcheck: 0
     priority: 2
diff --git a/roles/testnode/vars/ubuntu.yml b/roles/testnode/vars/ubuntu.yml
index 7acb802..658bc22 100644
--- a/roles/testnode/vars/ubuntu.yml
+++ b/roles/testnode/vars/ubuntu.yml
@@ -1,7 +1,7 @@
 ---
 common_apt_repos:
   # mod_fastcgi for radosgw
-  - "deb http://gitbuilder.ceph.com/libapache-mod-fastcgi-deb-{{ansible_distribution_release}}-x86_64-basic/ref/master/ {{ansible_distribution_release}} main"
+  - "deb http://gitbuilder.ceph.com/libapache-mod-fastcgi-deb-{{ansible_distribution_release}}-{{ansible_architecture}}-basic/ref/master/ {{ansible_distribution_release}} main"
 
 common_packages:
   # for apache