mirror of https://github.com/ceph/ceph-ansible.git
common: remove uncessary conditions and spell red hat entirely
We do not need to run another condition for 'ceph_rhcs' since the include we came from already has it, so we are already inside this condition. We also spell red hat entirely instead of rh and we remove capital letters. Signed-off-by: Sébastien Han <seb@redhat.com>pull/1186/head
parent
13a72fd24b
commit
3776c23b9a
|
@ -3,15 +3,13 @@
|
|||
# ISOs have MON, OSD, Tools, and Agent. If ISOs change the layout or provide
|
||||
# certain repos depending on the type of node this task will require a more
|
||||
# intelligent way to determine the location of the key.
|
||||
- name: install the rh ceph storage repository key
|
||||
- name: install the red hat ceph storage repository key
|
||||
apt_key:
|
||||
file: "{{ ceph_rhcs_repository_path }}/MON/release.asc"
|
||||
state: present
|
||||
when:
|
||||
- ceph_rhcs
|
||||
- ceph_rhcs_iso_install
|
||||
when: ceph_rhcs_iso_install
|
||||
|
||||
- name: add rh ceph storage repositories
|
||||
- name: add red hat ceph storage repositories
|
||||
apt_repository:
|
||||
repo: "deb file://{{ ceph_rhcs_repository_path }}/{{ item }}/ {{ ansible_lsb.codename }} main"
|
||||
state: present
|
||||
|
@ -21,9 +19,7 @@
|
|||
- "OSD"
|
||||
- "Tools"
|
||||
- "Agent"
|
||||
when:
|
||||
- ceph_rhcs
|
||||
- ceph_rhcs_iso_install
|
||||
when: ceph_rhcs_iso_install
|
||||
|
||||
- name: set apt pinning for red hat ceph storage
|
||||
template:
|
||||
|
@ -33,7 +29,7 @@
|
|||
group: root
|
||||
mode: 0644
|
||||
|
||||
- name: add the red hat storage apt-key
|
||||
- name: add red hat storage apt-key
|
||||
apt_key:
|
||||
data: "{{ lookup('file', role_path+'/files/cephstablerhcs.asc') }}"
|
||||
state: present
|
||||
|
@ -89,7 +85,7 @@
|
|||
state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
|
||||
when: client_group_name in group_names
|
||||
|
||||
- name: install red hat storage NFS gateway
|
||||
- name: install red hat storage nfs gateway
|
||||
apt:
|
||||
name: nfs-ganesha
|
||||
state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
|
||||
|
|
Loading…
Reference in New Issue