Skip to content

Commit

Permalink
nfs-ganesha support removal
Browse files Browse the repository at this point in the history
nfs-ganesha support will be implemented in a separate playbook.

Signed-off-by: Guillaume Abrioux <[email protected]>
  • Loading branch information
guits committed Mar 14, 2024
1 parent b5a5828 commit 89905e2
Show file tree
Hide file tree
Showing 34 changed files with 40 additions and 1,547 deletions.
1 change: 1 addition & 0 deletions group_vars/all.yml.sample
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ dummy:
#ceph_stable_repo: "{{ ceph_mirror }}/debian-{{ ceph_stable_release }}"

#nfs_ganesha_stable: true # use stable repos for nfs-ganesha
#nfs_ganesha_release: V5.7
#centos_release_nfs: centos-release-nfs-ganesha4
#nfs_ganesha_stable_deb_repo: http://ppa.launchpad.net/nfs-ganesha/nfs-ganesha-4/ubuntu
#nfs_ganesha_apt_keyserver: keyserver.ubuntu.com
Expand Down
131 changes: 0 additions & 131 deletions group_vars/nfss.yml.sample

This file was deleted.

4 changes: 3 additions & 1 deletion roles/ceph-config/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,9 @@
delegate_to: "{{ running_mon }}"

- name: Set rgw configs
when: inventory_hostname in groups.get(rgw_group_name, [])
when:
- inventory_hostname in groups.get(rgw_group_name, [])
or inventory_hostname in groups.get(nfs_group_name, [])
block:
- name: Render rgw configs
vars:
Expand Down
1 change: 1 addition & 0 deletions roles/ceph-defaults/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ ceph_stable_release: squid
ceph_stable_repo: "{{ ceph_mirror }}/debian-{{ ceph_stable_release }}"

nfs_ganesha_stable: true # use stable repos for nfs-ganesha
nfs_ganesha_release: V5.7
centos_release_nfs: centos-release-nfs-ganesha4
nfs_ganesha_stable_deb_repo: http://ppa.launchpad.net/nfs-ganesha/nfs-ganesha-4/ubuntu
nfs_ganesha_apt_keyserver: keyserver.ubuntu.com
Expand Down
1 change: 1 addition & 0 deletions roles/ceph-facts/tasks/facts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@
when:
- set_radosgw_address | default(true)
- inventory_hostname in groups.get(rgw_group_name, [])
or inventory_hostname in groups.get(nfs_group_name, [])

- name: Set_fact ceph_run_cmd
ansible.builtin.set_fact:
Expand Down
15 changes: 11 additions & 4 deletions roles/ceph-facts/tasks/set_radosgw_address.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,19 @@
- name: Set_fact _interface
ansible.builtin.set_fact:
_interface: "{{ (hostvars[item]['radosgw_interface'] | replace('-', '_')) }}"
loop: "{{ groups.get(rgw_group_name, []) }}"
with_items:
- "{{ groups.get(rgw_group_name, []) }}"
- "{{ groups.get(nfs_group_name, []) }}"
delegate_to: "{{ item }}"
delegate_facts: true
run_once: true

- name: Set_fact _radosgw_address to radosgw_interface - ipv4
ansible.builtin.set_fact:
_radosgw_address: "{{ hostvars[item]['ansible_facts'][hostvars[item]['_interface']][ip_version]['address'] }}"
loop: "{{ groups.get(rgw_group_name, []) }}"
with_items:
- "{{ groups.get(rgw_group_name, []) }}"
- "{{ groups.get(nfs_group_name, []) }}"
delegate_to: "{{ item }}"
delegate_facts: true
run_once: true
Expand All @@ -57,7 +61,9 @@
- name: Set_fact _radosgw_address to radosgw_interface - ipv6
ansible.builtin.set_fact:
_radosgw_address: "{{ hostvars[item]['ansible_facts'][hostvars[item]['_interface']][ip_version][0]['address'] | ansible.utils.ipwrap }}"
loop: "{{ groups.get(rgw_group_name, []) }}"
with_items:
- "{{ groups.get(rgw_group_name, []) }}"
- "{{ groups.get(nfs_group_name, []) }}"
delegate_to: "{{ item }}"
delegate_facts: true
run_once: true
Expand All @@ -66,7 +72,8 @@
- name: Rgw_instances
when:
- ceph_dashboard_call_item is defined or
inventory_hostname in groups.get(rgw_group_name, [])
(inventory_hostname in groups.get(rgw_group_name, [])
or inventory_hostname in groups.get(nfs_group_name, []))
block:
- name: Reset rgw_instances (workaround)
ansible.builtin.set_fact:
Expand Down
28 changes: 0 additions & 28 deletions roles/ceph-handler/tasks/handler_nfss.yml

This file was deleted.

26 changes: 0 additions & 26 deletions roles/ceph-handler/templates/restart_nfs_daemon.sh.j2

This file was deleted.

Loading

0 comments on commit 89905e2

Please sign in to comment.