From 4196de25d4c2e1fae54a14e5e00a57886afc499b Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Tue, 2 Sep 2014 02:37:18 +0200 Subject: [PATCH] Add developement packages support MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This commits introduces the support of the developpement branches of Ceph. You can now install Ceph from master. The behavior is done through 2 new options: * ceph_stable: true will use the stable branch * ceph_dev: true will use the dev branch For the dev packages don't forget to set the branch that you want to use. Signed-off-by: Sébastien Han --- roles/ceph-common/defaults/main.yml | 10 +++-- roles/ceph-common/files/cephdev.asc | 41 +++++++++++++++++++ .../files/{cephrelease.asc => cephstable.asc} | 0 roles/ceph-common/tasks/Debian.yml | 18 ++++++-- roles/ceph-common/tasks/RedHat.yml | 18 ++++++-- 5 files changed, 76 insertions(+), 11 deletions(-) create mode 100644 roles/ceph-common/files/cephdev.asc rename roles/ceph-common/files/{cephrelease.asc => cephstable.asc} (100%) diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml index 2c9d4552d..32a12dcf1 100644 --- a/roles/ceph-common/defaults/main.yml +++ b/roles/ceph-common/defaults/main.yml @@ -6,11 +6,15 @@ # ACTIVATE THE FSID VARIABLE FOR NON-VAGRANT DEPLOYMENT #fsid: -distro_release: "{{ facter_lsbdistcodename }}" # Seems to be not used. -apt_key: http://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc -ceph_release: firefly + +## Packages branch +ceph_stable: true # use ceph stable branch +ceph_stable_release: firefly # ceph stable release redhat_distro: el6 # supported distros are el6, rhel6, f18, f19, opensuse12.2, sles11 +ceph_dev: false # use ceph developement branch +ceph_dev_branch: master # developement branch you would like to use e.g: master, wip-hack + ## Ceph options # cephx: true diff --git a/roles/ceph-common/files/cephdev.asc b/roles/ceph-common/files/cephdev.asc new file mode 100644 index 000000000..e43bd6c6e --- /dev/null +++ b/roles/ceph-common/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-common/files/cephrelease.asc b/roles/ceph-common/files/cephstable.asc similarity index 100% rename from roles/ceph-common/files/cephrelease.asc rename to roles/ceph-common/files/cephstable.asc diff --git a/roles/ceph-common/tasks/Debian.yml b/roles/ceph-common/tasks/Debian.yml index 4bddb8bc9..faddc60d1 100644 --- a/roles/ceph-common/tasks/Debian.yml +++ b/roles/ceph-common/tasks/Debian.yml @@ -21,11 +21,21 @@ - ntp - hdparm -- name: Install the Ceph key - apt_key: data="{{ lookup('file', 'cephrelease.asc') }}" state=present +- name: Install the Ceph repository stable key + apt_key: data="{{ lookup('file', 'cephstable.asc') }}" state=present + when: ceph_stable -- name: Add Ceph repository - apt_repository: repo='deb http://ceph.com/debian-{{ ceph_release }}/ {{ ansible_lsb.codename }} main' state=present +- name: Install the Ceph developement repository key + apt_key: data="{{ lookup('file', 'cephdev.asc') }}" state=present + when: ceph_dev + +- name: Add Ceph stable repository + apt_repository: repo='deb http://ceph.com/debian-{{ ceph_stable_release }}/ {{ ansible_lsb.codename }} main' state=present + when: ceph_stable + +- name: Add Ceph development repository + apt_repository: repo='deb http://gitbuilder.ceph.com/ceph-deb-{{ ansible_lsb.codename }}-x86_64-basic/ref/{{ ceph_dev_branch }} {{ ansible_lsb.codename }} main' state=present + when: ceph_dev - name: Install Ceph apt: pkg={{ item }} state=latest diff --git a/roles/ceph-common/tasks/RedHat.yml b/roles/ceph-common/tasks/RedHat.yml index 02c9069f7..a9e0ede77 100644 --- a/roles/ceph-common/tasks/RedHat.yml +++ b/roles/ceph-common/tasks/RedHat.yml @@ -21,11 +21,21 @@ - ntp - hdparm -- name: Install the Ceph key - rpm_key: key=cephrelease.asc state=present +- name: Install the Ceph stable repository key + rpm_key: key=cephstable.asc state=present + when: ceph_stable -- name: Add Ceph repository - command: rpm -U http://ceph.com/rpm-{{ ceph_release }}/{{ redhat_distro }}/noarch/ceph-release-1-0.el6.noarch.rpm creates=/etc/yum.repos.d/ceph.repo +- name: Install the Ceph developement repository key + rpm_key: key=cephdev.asc state=present + when: ceph_dev + +- name: Add Ceph stable repository + command: rpm -U http://ceph.com/rpm-{{ ceph_stable_release }}/{{ redhat_distro }}/noarch/ceph-release-1-0.el6.noarch.rpm creates=/etc/yum.repos.d/cephstable.repo + when: ceph_stable + +- name: Add Ceph development repository + command: rpm -U http://gitbuilder.ceph.com/ceph-rpm-{{ ansible_lsb.codename }}-x86_64-basic/ref/{{ ceph_dev_branch }}/noarch/ceph-release-1-0.el6.noarch.rpm {{ ansible_lsb.codename }} main creates=/etc/yum.repos.d/cephdev.repo + when: ceph_dev - name: Install Ceph yum: name=ceph state=latest -- 2.47.3