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

Change ansible_lsb by ansible_distribution_release 

The ansible_lsb fact is based on the lsb package (lsb-base,
lsb-release or redhat-lsb-core).
If the package isn't installed on the remote host then the fact isn't
populated.

--------
"ansible_lsb": {},
--------

Switching to the ansible_distribution_release fact instead.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
pull/4141/head
Dimitri Savineau 2019-06-20 14:04:24 -04:00 committed by Dimitri Savineau
parent 6dce51183b
commit dc187ea6fa
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
group_vars/all.yml.sample
View File

@ -163,7 +163,7 @@ dummy:
# Use the option below to specify your applicable package tree, eg. when using non-LTS Ubuntu versions # Use the option below to specify your applicable package tree, eg. when using non-LTS Ubuntu versions
# # for a list of available Debian distributions, visit http://download.ceph.com/debian-{{ ceph_stable_release }}/dists/ # # for a list of available Debian distributions, visit http://download.ceph.com/debian-{{ ceph_stable_release }}/dists/
# for more info read: https://github.com/ceph/ceph-ansible/issues/305 # for more info read: https://github.com/ceph/ceph-ansible/issues/305
#ceph_stable_distro_source: "{{ ansible_lsb.codename }}" #ceph_stable_distro_source: "{{ ansible_distribution_release }}"
# This option is needed for _both_ stable and dev version, so please always fill the right version # This option is needed for _both_ stable and dev version, so please always fill the right version
# # for supported distros, see http://download.ceph.com/rpm-{{ ceph_stable_release }}/ # # for supported distros, see http://download.ceph.com/rpm-{{ ceph_stable_release }}/
@ -199,7 +199,7 @@ dummy:
# #
#ceph_stable_repo_uca: "http://ubuntu-cloud.archive.canonical.com/ubuntu" #ceph_stable_repo_uca: "http://ubuntu-cloud.archive.canonical.com/ubuntu"
#ceph_stable_openstack_release_uca: queens #ceph_stable_openstack_release_uca: queens
#ceph_stable_release_uca: "{{ ansible_lsb.codename }}-updates/{{ ceph_stable_openstack_release_uca }}" #ceph_stable_release_uca: "{{ ansible_distribution_release }}-updates/{{ ceph_stable_openstack_release_uca }}"
# REPOSITORY: openSUSE OBS # REPOSITORY: openSUSE OBS
# #

4
group_vars/rhcs.yml.sample
View File

@ -163,7 +163,7 @@ ceph_repository: rhcs
# Use the option below to specify your applicable package tree, eg. when using non-LTS Ubuntu versions # Use the option below to specify your applicable package tree, eg. when using non-LTS Ubuntu versions
# # for a list of available Debian distributions, visit http://download.ceph.com/debian-{{ ceph_stable_release }}/dists/ # # for a list of available Debian distributions, visit http://download.ceph.com/debian-{{ ceph_stable_release }}/dists/
# for more info read: https://github.com/ceph/ceph-ansible/issues/305 # for more info read: https://github.com/ceph/ceph-ansible/issues/305
#ceph_stable_distro_source: "{{ ansible_lsb.codename }}" #ceph_stable_distro_source: "{{ ansible_distribution_release }}"
# This option is needed for _both_ stable and dev version, so please always fill the right version # This option is needed for _both_ stable and dev version, so please always fill the right version
# # for supported distros, see http://download.ceph.com/rpm-{{ ceph_stable_release }}/ # # for supported distros, see http://download.ceph.com/rpm-{{ ceph_stable_release }}/
@ -199,7 +199,7 @@ ceph_rhcs_version: 4
# #
#ceph_stable_repo_uca: "http://ubuntu-cloud.archive.canonical.com/ubuntu" #ceph_stable_repo_uca: "http://ubuntu-cloud.archive.canonical.com/ubuntu"
#ceph_stable_openstack_release_uca: queens #ceph_stable_openstack_release_uca: queens
#ceph_stable_release_uca: "{{ ansible_lsb.codename }}-updates/{{ ceph_stable_openstack_release_uca }}" #ceph_stable_release_uca: "{{ ansible_distribution_release }}-updates/{{ ceph_stable_openstack_release_uca }}"
# REPOSITORY: openSUSE OBS # REPOSITORY: openSUSE OBS
# #

2
roles/ceph-common/tasks/installs/debian_community_repository.yml
View File

@ -15,6 +15,6 @@
- name: configure debian ceph stable community repository - name: configure debian ceph stable community repository
apt_repository: apt_repository:
repo: "deb {{ ceph_stable_repo }} {{ ceph_stable_distro_source | default(ansible_lsb.codename) }} main" repo: "deb {{ ceph_stable_repo }} {{ ceph_stable_distro_source | default(ansible_distribution_release) }} main"
state: present state: present
update_cache: yes update_cache: yes

2
roles/ceph-common/tasks/installs/debian_custom_repository.yml
View File

@ -1,7 +1,7 @@
--- ---
- name: configure debian custom repository - name: configure debian custom repository
apt_repository: apt_repository:
repo: "deb {{ ceph_custom_repo }} {{ ansible_lsb.codename }} main" repo: "deb {{ ceph_custom_repo }} {{ ansible_distribution_release }} main"
state: present state: present
update_cache: no update_cache: no
notify: update apt cache if a repo was added notify: update apt cache if a repo was added

2
roles/ceph-common/tasks/installs/debian_dev_repository.yml
View File

@ -1,7 +1,7 @@
--- ---
- name: fetch ceph debian development repository - name: fetch ceph debian development repository
uri: uri:
url: https://shaman.ceph.com/api/repos/ceph/{{ ceph_dev_branch }}/{{ ceph_dev_sha1 }}/{{ ansible_distribution | lower }}/{{ ansible_lsb.codename }}/repo url: https://shaman.ceph.com/api/repos/ceph/{{ ceph_dev_branch }}/{{ ceph_dev_sha1 }}/{{ ansible_distribution | lower }}/{{ ansible_distribution_release }}/repo
return_content: yes return_content: yes
register: ceph_dev_deb_repo register: ceph_dev_deb_repo

2
roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install_debian.yml
View File

@ -8,7 +8,7 @@
- name: enable red hat storage monitor repository for debian systems - name: enable red hat storage monitor repository for debian systems
apt_repository: apt_repository:
repo: "deb {{ ceph_rhcs_cdn_debian_repo }}{{ ceph_rhcs_cdn_debian_repo_version }}/{{ item.repo }} {{ ceph_stable_distro_source | default(ansible_lsb.codename) }} main" repo: "deb {{ ceph_rhcs_cdn_debian_repo }}{{ ceph_rhcs_cdn_debian_repo_version }}/{{ item.repo }} {{ ceph_stable_distro_source | default(ansible_distribution_release) }} main"
state: present state: present
update_cache: yes update_cache: yes
with_items: with_items:

2
roles/ceph-common/tasks/installs/prerequisite_rhcs_iso_install_debian.yml
View File

@ -51,7 +51,7 @@
- name: add red hat storage repository for debian systems - name: add red hat storage repository for debian systems
apt_repository: apt_repository:
repo: "deb file://{{ ceph_rhcs_repository_path }}/{{ item }} {{ ansible_lsb.codename }} main" repo: "deb file://{{ ceph_rhcs_repository_path }}/{{ item }} {{ ansible_distribution_release }} main"
state: present state: present
update_cache: yes update_cache: yes
with_items: with_items:

4
roles/ceph-defaults/defaults/main.yml
View File

@ -155,7 +155,7 @@ nfs_ganesha_stable_deb_repo: "{{ ceph_mirror }}/nfs-ganesha/deb-{{ nfs_ganesha_s
# Use the option below to specify your applicable package tree, eg. when using non-LTS Ubuntu versions # Use the option below to specify your applicable package tree, eg. when using non-LTS Ubuntu versions
# # for a list of available Debian distributions, visit http://download.ceph.com/debian-{{ ceph_stable_release }}/dists/ # # for a list of available Debian distributions, visit http://download.ceph.com/debian-{{ ceph_stable_release }}/dists/
# for more info read: https://github.com/ceph/ceph-ansible/issues/305 # for more info read: https://github.com/ceph/ceph-ansible/issues/305
#ceph_stable_distro_source: "{{ ansible_lsb.codename }}" #ceph_stable_distro_source: "{{ ansible_distribution_release }}"
# This option is needed for _both_ stable and dev version, so please always fill the right version # This option is needed for _both_ stable and dev version, so please always fill the right version
# # for supported distros, see http://download.ceph.com/rpm-{{ ceph_stable_release }}/ # # for supported distros, see http://download.ceph.com/rpm-{{ ceph_stable_release }}/
@ -191,7 +191,7 @@ ceph_rhcs_cdn_debian_repo_version: "/3-release/" # for GA, later for updates use
# #
ceph_stable_repo_uca: "http://ubuntu-cloud.archive.canonical.com/ubuntu" ceph_stable_repo_uca: "http://ubuntu-cloud.archive.canonical.com/ubuntu"
ceph_stable_openstack_release_uca: queens ceph_stable_openstack_release_uca: queens
ceph_stable_release_uca: "{{ ansible_lsb.codename }}-updates/{{ ceph_stable_openstack_release_uca }}" ceph_stable_release_uca: "{{ ansible_distribution_release }}-updates/{{ ceph_stable_openstack_release_uca }}"
# REPOSITORY: openSUSE OBS # REPOSITORY: openSUSE OBS
# #

2
roles/ceph-nfs/tasks/pre_requisite_non_container_debian.yml
View File

@ -9,7 +9,7 @@
block: block:
- name: add nfs-ganesha stable repository - name: add nfs-ganesha stable repository
apt_repository: apt_repository:
repo: "deb {{ nfs_ganesha_stable_deb_repo }} {{ ceph_stable_distro_source | default(ansible_lsb.codename) }} main" repo: "deb {{ nfs_ganesha_stable_deb_repo }} {{ ceph_stable_distro_source | default(ansible_distribution_release) }} main"
state: present state: present
update_cache: no update_cache: no
register: add_ganesha_apt_repo register: add_ganesha_apt_repo