Merge pull request #1482 from ceph/remove-debian-ceph-packages

ceph-common: remove debian_ceph_packages
pull/1492/head
Andrew Schoen 2017-05-03 08:55:23 -05:00 committed by GitHub
commit 4f4940dd9b
3 changed files with 1 additions and 20 deletions

View File

@ -74,15 +74,6 @@ dummy:
# ceph nodes # ceph nodes
#ntp_service_enabled: true #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. # Whether or not to install the ceph-test package.
#ceph_test: False #ceph_test: False

View File

@ -66,15 +66,6 @@ redhat_package_dependencies:
# ceph nodes # ceph nodes
ntp_service_enabled: true 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. # Whether or not to install the ceph-test package.
ceph_test: False ceph_test: False

View File

@ -17,11 +17,10 @@
- name: install ceph - name: install ceph
apt: apt:
name: "{{ item }}" name: "ceph"
update_cache: no update_cache: no
state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}" 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 ''}}" 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 - name: install ceph-test
apt: apt: