ceph-common: remove debian_ceph_packages

We shouldn't need this anymore as the upgrade bug that
debian_ceph_packages was used to workaround should have
been fixed as of jewel.

See https://github.com/ceph/ceph-ansible/issues/1481 for more
detailed information.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index cb8b968f9a0872c402a1f793f8666d165681bc8b..bd121bad6e0da1139fb09309b5ffe84d9946e01a 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -74,15 +74,6 @@ dummy:
 # ceph nodes
 #ntp_service_enabled: true
 
-# The list of ceph packages needed for debian.
-# This variable should only be changed if packages are not available from a given
-# install source or architecture.
-#debian_ceph_packages:
-#  - ceph
-#  - ceph-common    #|--> yes, they are already all dependencies from 'ceph'
-#  - ceph-fs-common #|--> however while proceding to rolling upgrades and the 'ceph' package upgrade
-#  - ceph-fuse      #|--> they don't get update so we need to force them
-
 # Whether or not to install the ceph-test package.
 #ceph_test: False
 

diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index 244e612c02eb3d7d6df093ef868ab5b69cacbb77..830117c71c3dc137be4686a1c746fa10b597e3c8 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -66,15 +66,6 @@ redhat_package_dependencies:
 # ceph nodes
 ntp_service_enabled: true
 
-# The list of ceph packages needed for debian.
-# This variable should only be changed if packages are not available from a given
-# install source or architecture.
-debian_ceph_packages:
-  - ceph
-  - ceph-common    #|--> yes, they are already all dependencies from 'ceph'
-  - ceph-fs-common #|--> however while proceding to rolling upgrades and the 'ceph' package upgrade
-  - ceph-fuse      #|--> they don't get update so we need to force them
-
 # Whether or not to install the ceph-test package.
 ceph_test: False
 

diff --git a/roles/ceph-common/tasks/installs/install_on_debian.yml b/roles/ceph-common/tasks/installs/install_on_debian.yml
index f2577639928fa46f8332094fdd801730e8c58b61..ae6dfda92c9972d2e34a2dab67c54849f4b4e21b 100644 (file)
--- a/roles/ceph-common/tasks/installs/install_on_debian.yml
+++ b/roles/ceph-common/tasks/installs/install_on_debian.yml
@@ -17,11 +17,10 @@
 
 - name: install ceph
   apt:
-    name: "{{ item }}"
+    name: "ceph"
     update_cache: no
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
     default_release: "{{ ceph_stable_release_uca | default(ansible_distribution_release) }}{{ '-backports' if ceph_origin == 'distro' and ceph_use_distro_backports else ''}}"
-  with_items: "{{ debian_ceph_packages }}"
 
 - name: install ceph-test
   apt: