testnode: Only install custom fastcgi repo on Trusty testnodes

Now that we're running apt/repos.yml tasks on Xenial, we can move
the fastcgi repo to ubuntu_14.yml since it's exclusive to that distro
version.

Signed-off-by: David Galloway <dgallowa@redhat.com>

diff --git a/roles/testnode/vars/ubuntu.yml b/roles/testnode/vars/ubuntu.yml
index 31cb4b824732b968d6eaa904937dd8d221e26538..49c306abff4dc540007675c474f6ef574074f4f4 100644 (file)
--- a/roles/testnode/vars/ubuntu.yml
+++ b/roles/testnode/vars/ubuntu.yml
@@ -1,8 +1,4 @@
 ---
-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"
-
 common_packages:
   # for apache
   - libfcgi0ldbl

diff --git a/roles/testnode/vars/ubuntu_14.yml b/roles/testnode/vars/ubuntu_14.yml
index 1751e7900efe1fae451e0b8add942d49f9446051..36389d6d2a6db77a5f82ab6053dd95ff059b8b87 100644 (file)
--- a/roles/testnode/vars/ubuntu_14.yml
+++ b/roles/testnode/vars/ubuntu_14.yml
@@ -1,4 +1,8 @@
 ---
+apt_repos:
+  # mod_fastcgi for radosgw
+  - "deb http://gitbuilder.ceph.com/libapache-mod-fastcgi-deb-trusty-x86_64-basic/ref/master/ trusty main"
+
 packages:
   - libboost-thread1.54.0
   - mpich