From: Zack Cerza <zack@cerza.org>
Date: Thu, 17 Dec 2015 16:30:33 +0000 (-0700)
Subject: Revert "Disable fastcgi repos and package installs"
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9693da647733c0b168c8d19115bb976d89be62ab;p=ceph-cm-ansible.git

Revert "Disable fastcgi repos and package installs"
---

diff --git a/roles/testnode/vars/centos_6.yml b/roles/testnode/vars/centos_6.yml
index 9d6c079..a05967a 100644
--- a/roles/testnode/vars/centos_6.yml
+++ b/roles/testnode/vars/centos_6.yml
@@ -5,7 +5,7 @@ yum_repos:
   centos6-fcgi-ceph:
     name: Cent OS 6 Local fastcgi Repo
     baseurl: http://gitbuilder.ceph.com/mod_fastcgi-rpm-centos6-x86_64-basic/ref/master/
-    enabled: 0
+    enabled: 1
     gpgcheck: 0
     priority: 2
   centos6-misc-ceph:
@@ -90,7 +90,7 @@ packages:
   - httpd-devel
   - httpd-tools
   - mod_ssl
-  #- mod_fastcgi-2.4.7-1.ceph.el6
+  - mod_fastcgi-2.4.7-1.ceph.el6
   ###
   - libevent-devel
   - python-devel
diff --git a/roles/testnode/vars/centos_7.yml b/roles/testnode/vars/centos_7.yml
index eafb0ec..159d727 100644
--- a/roles/testnode/vars/centos_7.yml
+++ b/roles/testnode/vars/centos_7.yml
@@ -5,7 +5,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/
-    enabled: 0
+    enabled: 1
     gpgcheck: 0
     priority: 2
   lab-extras:
@@ -75,7 +75,7 @@ packages:
   - httpd-devel
   - httpd-tools
   - mod_ssl
-  #- mod_fastcgi-2.4.7-1.ceph.el7.centos
+  - mod_fastcgi-2.4.7-1.ceph.el7.centos
   ###
   - libevent-devel
   # for pretty-printing xml
diff --git a/roles/testnode/vars/debian_7.yml b/roles/testnode/vars/debian_7.yml
index 0d16bef..568dd42 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-x86_64-basic/ref/master/ wheezy main"
 
 packages:
   - lsb-release
@@ -102,5 +102,5 @@ packages_to_upgrade:
   - apt
   - libcurl3-gnutls
   - apache2
-  #- libapache2-mod-fastcgi
+  - libapache2-mod-fastcgi
   - libfcgi0ldbl
diff --git a/roles/testnode/vars/debian_8.yml b/roles/testnode/vars/debian_8.yml
index ee53f67..16edf7f 100644
--- a/roles/testnode/vars/debian_8.yml
+++ b/roles/testnode/vars/debian_8.yml
@@ -100,5 +100,5 @@ packages_to_upgrade:
   - apt
   - libcurl3-gnutls
   - apache2
-  #- libapache2-mod-fastcgi
+  - libapache2-mod-fastcgi
   - libfcgi0ldbl
diff --git a/roles/testnode/vars/fedora_20.yml b/roles/testnode/vars/fedora_20.yml
index 783b9e0..bf62b3c 100644
--- a/roles/testnode/vars/fedora_20.yml
+++ b/roles/testnode/vars/fedora_20.yml
@@ -3,7 +3,7 @@ yum_repos:
   fedora-fcgi-ceph:
     name: Fedora Local fastcgi Repo
     baseurl: http://gitbuilder.ceph.com/mod_fastcgi-rpm-fedora20-x86_64-basic/ref/master/
-    enabled: 0
+    enabled: 1
     gpgcheck: 0
     priority: 0
 
@@ -80,7 +80,7 @@ packages:
   - httpd-devel
   - httpd-tools
   - mod_ssl
-  #- mod_fastcgi-2.4.7-1.ceph.fc20
+  - mod_fastcgi-2.4.7-1.ceph.fc20
   ###
   - libevent-devel
   - python-devel
diff --git a/roles/testnode/vars/ubuntu.yml b/roles/testnode/vars/ubuntu.yml
index bd26b74..7acb802 100644
--- a/roles/testnode/vars/ubuntu.yml
+++ b/roles/testnode/vars/ubuntu.yml
@@ -1,7 +1,7 @@
 ---
-#common_apt_repos:
+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}}-x86_64-basic/ref/master/ {{ansible_distribution_release}} main"
 
 common_packages:
   # for apache
@@ -107,7 +107,7 @@ common_packages:
 packages_to_upgrade:
   - apt
   - apache2
-  #- libapache2-mod-fastcgi
+  - libapache2-mod-fastcgi
 
 packages_to_remove:
    # openmpi-common conflicts with mpitch stuff