Merge pull request #3472 from carmstrong/ceph-hammer

chore(store): bump Ceph to "hammer" release

Author: carmstrong

docs/managing_deis/add_remove_host.rst

@@ -272,7 +272,7 @@ Reminder: make sure you're logged into the machine you're removing from the clus
     deis-store-metadata
 
 This is actually all that's necessary. Ceph provides a ``ceph mds rm`` command, but has no
-documentation for it. See: http://docs.ceph.com/docs/giant/rados/operations/control/#mds-subsystem
+documentation for it. See: http://docs.ceph.com/docs/hammer/rados/operations/control/#mds-subsystem
 
 Removing the host from etcd
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -282,5 +282,5 @@ This can be achieved by making a request to the etcd API. See `remove machines`_
 
 .. _`custom firewall script`: https://github.com/deis/deis/blob/master/contrib/util/custom-firewall.sh
 .. _`remove machines`: https://coreos.com/docs/distributed-configuration/etcd-api/#remove-machines
-.. _`removing monitors`: http://ceph.com/docs/giant/rados/operations/add-or-rm-mons/#removing-monitors
-.. _`removing OSDs`: http://docs.ceph.com/docs/giant/rados/operations/add-or-rm-osds/#removing-osds-manual
+.. _`removing monitors`: http://ceph.com/docs/hammer/rados/operations/add-or-rm-mons/#removing-monitors
+.. _`removing OSDs`: http://docs.ceph.com/docs/hammer/rados/operations/add-or-rm-osds/#removing-osds-manual

docs/troubleshooting_deis/troubleshooting-store.rst

@@ -9,10 +9,10 @@ Troubleshooting deis-store
 The store component is the most complex component of Deis. As such, there are many ways for it to fail.
 Recall that the store components represent Ceph services as follows:
 
-* ``store-monitor``: http://ceph.com/docs/giant/man/8/ceph-mon/
-* ``store-daemon``: http://ceph.com/docs/giant/man/8/ceph-osd/
-* ``store-gateway``: http://ceph.com/docs/giant/radosgw/
-* ``store-metadata``: http://ceph.com/docs/giant/man/8/ceph-mds/
+* ``store-monitor``: http://ceph.com/docs/hammer/man/8/ceph-mon/
+* ``store-daemon``: http://ceph.com/docs/hammer/man/8/ceph-osd/
+* ``store-gateway``: http://ceph.com/docs/hammer/radosgw/
+* ``store-metadata``: http://ceph.com/docs/hammer/man/8/ceph-mds/
 * ``store-volume``: a system service which mounts a `Ceph FS`_ volume to be used by the controller and logger components
 
 Log output for store components can be viewed with ``deisctl status store-<component>`` (such as
@@ -126,5 +126,5 @@ failing store-volume, application logs will be lost until the volume recovers.
 
 Note that store-volume requires CoreOS >= 471.1.0 for the CephFS kernel module.
 
-.. _`Ceph FS`: https://ceph.com/docs/giant/cephfs/
-.. _`troubleshooting`: http://docs.ceph.com/docs/giant/rados/troubleshooting/
+.. _`Ceph FS`: https://ceph.com/docs/hammer/cephfs/
+.. _`troubleshooting`: http://docs.ceph.com/docs/hammer/rados/troubleshooting/

store/base/build.sh

@@ -24,7 +24,7 @@ curl -sSL -o /usr/local/bin/confd https://github.com/kelseyhightower/confd/relea
 	&& chmod +x /usr/local/bin/confd
 
 curl -sSL 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc' | apt-key add -
-echo "deb http://ceph.com/debian-giant trusty main" > /etc/apt/sources.list.d/ceph.list
+echo "deb http://ceph.com/debian-hammer trusty main" > /etc/apt/sources.list.d/ceph.list
 
 apt-get update && apt-get install -yq ceph