From 9fec57a583aaa44812608817a0a9420d23c13e9b Mon Sep 17 00:00:00 2001 From: Samuel Matzek Date: Tue, 10 May 2016 14:20:29 -0500 Subject: [PATCH] Add Debian ppc64le support Add support to allow ceph-ansible to install and configure Ceph on Debian on the ppc64le architecture. Canonical has ppc64le Debian packages in Ubuntu distros and on Ubuntu Cloud Archive. Both of which can be installed and configured using the 'distro' or 'uca' options in ceph-ansible when this patch is used. Signed-off-by: Samuel Matzek --- group_vars/all.sample | 11 +++++++++++ roles/ceph-common/defaults/main.yml | 11 +++++++++++ roles/ceph-common/tasks/checks/check_system.yml | 2 +- .../ceph-common/tasks/installs/install_on_debian.yml | 7 +------ 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/group_vars/all.sample b/group_vars/all.sample index f76363094..68bbe3174 100644 --- a/group_vars/all.sample +++ b/group_vars/all.sample @@ -64,6 +64,17 @@ dummy: # - ntp # - python-setuptools + +# 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 #| +# - ceph-fs-common #|--> yes, they are already all dependencies from 'ceph' +# - ceph-fuse #|--> however while proceding to rolling upgrades and the 'ceph' package upgrade +# - libcephfs1 #|--> 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 10e17830d..b9ef06b18 100644 --- a/roles/ceph-common/defaults/main.yml +++ b/roles/ceph-common/defaults/main.yml @@ -56,6 +56,17 @@ redhat_package_dependencies: - ntp - python-setuptools + +# 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 #| + - ceph-fs-common #|--> yes, they are already all dependencies from 'ceph' + - ceph-fuse #|--> however while proceding to rolling upgrades and the 'ceph' package upgrade + - libcephfs1 #|--> 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/checks/check_system.yml b/roles/ceph-common/tasks/checks/check_system.yml index 75ae20ba1..55458b129 100644 --- a/roles/ceph-common/tasks/checks/check_system.yml +++ b/roles/ceph-common/tasks/checks/check_system.yml @@ -7,7 +7,7 @@ - name: fail on unsupported architecture fail: msg: "Architecture not supported {{ ansible_architecture }}" - when: "'{{ ansible_architecture }}' not in ['x86_64']" + when: "'{{ ansible_architecture }}' not in ['x86_64', 'ppc64le']" - name: fail on unsupported distribution fail: diff --git a/roles/ceph-common/tasks/installs/install_on_debian.yml b/roles/ceph-common/tasks/installs/install_on_debian.yml index 36d778402..858a748f5 100644 --- a/roles/ceph-common/tasks/installs/install_on_debian.yml +++ b/roles/ceph-common/tasks/installs/install_on_debian.yml @@ -16,12 +16,7 @@ pkg: "{{ item }}" 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: - - ceph - - ceph-common #| - - ceph-fs-common #|--> yes, they are already all dependencies from 'ceph' - - ceph-fuse #|--> however while proceding to rolling upgrades and the 'ceph' package upgrade - - libcephfs1 #|--> they don't get update so we need to force them + with_items: debian_ceph_packages - name: install ceph-test apt: -- 2.39.5