ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1290 from zhsj/ceph-mirror 

add ceph_mirror variable
pull/1291/head
Sébastien Han 2017-02-08 09:04:50 +01:00 committed by GitHub
parent 1b58afce7f 7e10b0325b
commit 98fd05fa41
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
group_vars/all.yml.sample
View File

@ -114,9 +114,10 @@ dummy:
# COMMUNITY VERSION # COMMUNITY VERSION
#ceph_stable: false # use ceph stable branch #ceph_stable: false # use ceph stable branch
#ceph_mirror: http://download.ceph.com
#ceph_stable_key: https://download.ceph.com/keys/release.asc #ceph_stable_key: https://download.ceph.com/keys/release.asc
#ceph_stable_release: jewel # ceph stable release #ceph_stable_release: jewel # ceph stable release
#ceph_stable_repo: "http://download.ceph.com/debian-{{ ceph_stable_release }}" #ceph_stable_repo: "{{ ceph_mirror }}/debian-{{ ceph_stable_release }}"
###################################### ######################################
# Releases name to number dictionary # # Releases name to number dictionary #

3
roles/ceph-common/defaults/main.yml
View File

@ -106,9 +106,10 @@ ceph_use_distro_backports: false # DEBIAN ONLY
# COMMUNITY VERSION # COMMUNITY VERSION
ceph_stable: false # use ceph stable branch ceph_stable: false # use ceph stable branch
ceph_mirror: http://download.ceph.com
ceph_stable_key: https://download.ceph.com/keys/release.asc ceph_stable_key: https://download.ceph.com/keys/release.asc
ceph_stable_release: jewel # ceph stable release ceph_stable_release: jewel # ceph stable release
ceph_stable_repo: "http://download.ceph.com/debian-{{ ceph_stable_release }}" ceph_stable_repo: "{{ ceph_mirror }}/debian-{{ ceph_stable_release }}"
###################################### ######################################
# Releases name to number dictionary # # Releases name to number dictionary #

9
roles/ceph-common/tasks/installs/redhat_ceph_repository.yml
View File

@ -7,11 +7,18 @@
- name: add ceph stable repository - name: add ceph stable repository
package: package:
name: http://download.ceph.com/rpm-{{ ceph_stable_release }}/{{ ceph_stable_redhat_distro }}/noarch/ceph-release-1-0.{{ ceph_stable_redhat_distro|replace('rhel', 'el') }}.noarch.rpm name: "{{ ceph_mirror }}/rpm-{{ ceph_stable_release }}/{{ ceph_stable_redhat_distro }}/noarch/ceph-release-1-0.{{ ceph_stable_redhat_distro|replace('rhel', 'el') }}.noarch.rpm"
state: present state: present
changed_when: false changed_when: false
when: ceph_stable when: ceph_stable
- name: change download url to ceph mirror
replace:
name: /etc/yum.repos.d/ceph.repo
regexp: http://download.ceph.com
replace: "{{ ceph_mirror }}"
when: ceph_mirror != "http://download.ceph.com"
# we must use curl instead of ansible's uri module because SNI support in # we must use curl instead of ansible's uri module because SNI support in
# Python is only available in 2.7.9 and later, and most supported distributions # Python is only available in 2.7.9 and later, and most supported distributions
# don't have that version, so a request to https fails. # don't have that version, so a request to https fails.