Revert "replace hardcoded x86_64 with {{ansible_architecture}}"

This reverts commit 74404d3e9f11c62fddb00fcc1616c02d7f520af3.

diff --git a/roles/testnode/vars/centos_7.yml b/roles/testnode/vars/centos_7.yml
index 37a085041be768cf03c4db1a6a335bc163a70e5e..e89d70c86ad5ad5a414f62618f6e1273f0f9e60c 100644 (file)
--- 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-{{ansible_architecture}}-basic/ref/master/
+    baseurl: http://gitbuilder.ceph.com/mod_fastcgi-rpm-centos7-x86_64-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 8a9e4f953094fc59e73594803d474619e4590982..568dd42326f4e40af4a183f9498708e59656353d 100644 (file)
--- 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-{{ansible_architecture}}-basic/ref/master/ wheezy main"
+  - "deb http://gitbuilder.ceph.com/libapache-mod-fastcgi-deb-wheezy-x86_64-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 a05b6cde0b287270c70eb61bce92e1229ffbf14e..7005d72236dce9712f8996f7899cbff5b8423bc6 100644 (file)
--- 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-{{ansible_architecture}}-basic/ref/master/"
+    baseurl: "http://{{ gitbuilder_host }}/mod_fastcgi-rpm-rhel7-x86_64-basic/ref/master/"
     enabled: 1
     gpgcheck: 0
     priority: 2

diff --git a/roles/testnode/vars/ubuntu.yml b/roles/testnode/vars/ubuntu.yml
index 658bc22ba5ef68771d051cde0e9b467af0a0cad7..7acb8022536f2c11c0d938576c55fd249a521794 100644 (file)
--- 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}}-{{ansible_architecture}}-basic/ref/master/ {{ansible_distribution_release}} main"
+  - "deb http://gitbuilder.ceph.com/libapache-mod-fastcgi-deb-{{ansible_distribution_release}}-x86_64-basic/ref/master/ {{ansible_distribution_release}} main"
 
 common_packages:
   # for apache