Support for 100-continue toggling for RGW

Tested for Precise and Trusty.

diff --git a/roles/ceph-common/tasks/install_on_debian.yml b/roles/ceph-common/tasks/install_on_debian.yml
index 972210065ead4fac96ffa8c63fb20ebb25c36de3..256b28ce717aeef3a8eeb726b9e70224e3a8393d 100644 (file)
--- a/roles/ceph-common/tasks/install_on_debian.yml
+++ b/roles/ceph-common/tasks/install_on_debian.yml
@@ -16,7 +16,7 @@
     state=present
   when: ceph_stable
 
-- name: Install the Ceph developement repository key
+- name: Install the Ceph development repository key
   apt_key: >
     data="{{ lookup('file', 'cephdev.asc') }}"
     state=present

diff --git a/roles/ceph-common/tasks/install_on_redhat.yml b/roles/ceph-common/tasks/install_on_redhat.yml
index f911af9b77da57de6dd5fe31e78b937a601a5ce8..54fb644794f15dbb92b72a2502a63cdae2a6047a 100644 (file)
--- a/roles/ceph-common/tasks/install_on_redhat.yml
+++ b/roles/ceph-common/tasks/install_on_redhat.yml
@@ -14,7 +14,7 @@
     state=present
   when: ceph_stable
 
-- name: Install the Ceph developement repository key
+- name: Install the Ceph development repository key
   rpm_key: >
     key={{ ceph_dev_key }}
     state=present

diff --git a/roles/ceph-common/vars/main.yml b/roles/ceph-common/vars/main.yml
index 79382fc80054cd9f30ae59fc406d5d512b0a7927..bcfc58f8068b13a6c89691b3c499a0b31435a67f 100644 (file)
--- a/roles/ceph-common/vars/main.yml
+++ b/roles/ceph-common/vars/main.yml
@@ -16,9 +16,10 @@ ceph_stable_release: giant # ceph stable release
 # # supported distros are el6, rhel6, f18, f19, opensuse12.2, sles11, centos7 (see http://ceph.com/rpm-firefly/)\r
 ceph_stable_redhat_distro: el7\r
 \r
-ceph_dev: false # use ceph developement branch\r
+ceph_dev: false # use ceph development branch\r
 ceph_dev_key: https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc\r
-ceph_dev_branch: master # developement branch you would like to use e.g: master, wip-hack\r
+ceph_dev_branch: master # development branch you would like to use e.g: master, wip-hack\r
+\r
 # supported distros are centos6, centos7, fc17, fc18, fc19, fc20, fedora17, fedora18,\r
 # fedora19, fedora20, opensuse12, sles0. (see http://gitbuilder.ceph.com/).\r
 # For rhel, please pay attention to the versions: 'rhel6 3' or 'rhel 4', the fullname is _very_ important.\r

diff --git a/roles/ceph-radosgw/files/cephdev.asc b/roles/ceph-radosgw/files/cephdev.asc
new file mode 100644 (file)
index 0000000..e43bd6c
--- /dev/null
+++ b/roles/ceph-radosgw/files/cephdev.asc
@@ -0,0 +1,41 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.10 (GNU/Linux)
+
+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
+=per8
+-----END PGP PUBLIC KEY BLOCK-----

diff --git a/roles/ceph-radosgw/tasks/install_debian.yml b/roles/ceph-radosgw/tasks/install_debian.yml
index 74c42f4adb315b1e858e519d2174d36fa0616493..aff7cd21f7d71a195087dbf4b4ad7591e648351b 100644 (file)
--- a/roles/ceph-radosgw/tasks/install_debian.yml
+++ b/roles/ceph-radosgw/tasks/install_debian.yml
@@ -8,18 +8,77 @@
     state=present
   when: ansible_lsb.codename in ['natty', 'oneiric', 'precise', 'quantal', 'raring', 'sid', 'squeeze', 'wheezy']
 
-# Needed for Ubuntu 14.04 to have access to libapache2-mod-fastcgi
-- name: Enable multiverse repo for fastcgi package access
+# Needed for Ubuntu 12.04 to have access to libapache2-mod-fastcgi if 100-continue isn't being used
+- name: Enable multiverse repo for Precise
+  command: "sed -i '/^# deb .* multiverse$/ s/^# //' /etc/apt/sources.list"
+  when: ansible_lsb.codename in ['precise'] and not http_100_continue
+
+# Disable the repo when we are using the Ceph repo for 100-continue packages
+- name: Disable multiverse repo for Precise
+  command: "sed -i '/^deb .* multiverse$/ s/^/# /' /etc/apt/sources.list"
+  when: ansible_lsb.codename in ['precise'] and http_100_continue
+
+# Needed for Ubuntu 14.04 to have access to libapache2-mod-fastcgi if 100-continue isn't being used
+- name: Enable multiverse repo for Trusty
   command: "apt-add-repository multiverse"
-  when: ansible_lsb.codename in ['trusty']
+  when: ansible_lsb.codename in ['trusty'] and not http_100_continue
+
+# Disable the repo when we are using the Ceph repo for 100-continue packages
+- name: Disable multiverse repo for Trusty
+  command: "apt-add-repository -r multiverse"
+  when: ansible_lsb.codename in ['trusty'] and http_100_continue
+
+# If using 100-continue, add Ceph dev key
+- name: Install the Ceph development repository key
+  apt_key: >
+    data="{{ lookup('file', 'cephdev.asc') }}"
+    state=present
+  when: http_100_continue
+
+# If using 100-continue, add Ceph sources and update
+- name: Add Ceph Apache and FastCGI sources
+  apt_repository: >
+    repo="{{ item }}"
+    state=present
+  with_items:
+    - deb http://gitbuilder.ceph.com/apache2-deb-{{ ansible_lsb.codename }}-x86_64-basic/ref/master {{ ansible_lsb.codename }} main
+    - deb http://gitbuilder.ceph.com/libapache-mod-fastcgi-deb-{{ ansible_lsb.codename }}-x86_64-basic/ref/master {{ ansible_lsb.codename }} main
+  register: purge_default_apache
+  when: http_100_continue
+
+# Else remove them to ensure you use the default packages
+- name: Remove Ceph Apache and FastCGI sources
+  apt_repository: >
+    repo="{{ item }}"
+    state=absent
+  with_items:
+    - deb http://gitbuilder.ceph.com/apache2-deb-{{ ansible_lsb.codename }}-x86_64-basic/ref/master {{ ansible_lsb.codename }} main
+    - deb http://gitbuilder.ceph.com/libapache-mod-fastcgi-deb-{{ ansible_lsb.codename }}-x86_64-basic/ref/master {{ ansible_lsb.codename }} main
+  register: purge_ceph_apache
+  when: not http_100_continue
+
+# Purge Ceph Apache and FastCGI packages if needed
+- name: "Purge Ceph Apache and FastCGI packages"
+  apt: >
+    pkg="{{ item }}"
+    state=absent
+    purge=yes
+  with_items:
+    - apache2
+    - apache2-bin
+    - apache2-data
+    - apache2-mpm-worker
+    - apache2-utils
+    - apache2.2-bin
+    - apache2.2-common
+    - libapache2-mod-fastcgi
+  when: purge_default_apache.changed or purge_ceph_apache.changed
 
-# update_cache needed for step above
 - name: "Install Apache, fastcgi and Rados Gateway"
   apt: >
     pkg={{ item }}
     state=present
     update_cache=yes
-    cache_valid_time=3600
   with_items:
     - apache2
     - libapache2-mod-fastcgi

diff --git a/roles/ceph-radosgw/vars/main.yml b/roles/ceph-radosgw/vars/main.yml
index e2fa05f346baefe9190d84408b812641e88aa97c..e4c31ef3750cc82b03c8f56e19ddc6e4247075b1 100644 (file)
--- a/roles/ceph-radosgw/vars/main.yml
+++ b/roles/ceph-radosgw/vars/main.yml
@@ -5,6 +5,10 @@
 #\r
 cephx: true\r
 \r
+# Toggle 100-continue support for Apache and FastCGI\r
+# WARNING: Changing this value will cause an outage of Apache while it is reinstalled on RGW nodes\r
+http_100_continue: false\r
+\r
 # Rados Gateway options\r
 redhat_distro_ceph_extra: centos6.4 # supported distros are centos6.3, centos6.4, centos6, fedora18, fedora19, opensuse12.2, rhel6.3, rhel6.4, rhel6.5, rhel6, sles11sp2\r
 email_address: foo@bar.com\r