From: David Galloway Date: Thu, 15 Jun 2017 16:15:01 +0000 (-0400) Subject: testnode: Only install custom fastcgi repo on Trusty testnodes X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3abf9db2a2cb9bbc8b89aa9bb957334f47aa912b;p=ceph-cm-ansible.git 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 --- diff --git a/roles/testnode/vars/ubuntu.yml b/roles/testnode/vars/ubuntu.yml index 31cb4b82..49c306ab 100644 --- 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 1751e790..36389d6d 100644 --- 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