stable-2.2: drop nfs_obj_gw

As Ali Maredia explains (in
https://github.com/ceph/ceph-ansible/issues/1907#issuecomment-331200448),
since the Ceph RGW/NFS gateway (with the nfs-ganesha RGW FSAL) is not
supported for any stable Ceph release prior to Luminous, the
nfs_obj_gw variable does not serve any real purpose in this
branch. Thus, remove it along with all references that use it.
pull/1935/head
Florian Haas 2017-09-21 18:21:49 +02:00
parent 3b01f8b412
commit b278d7cbcd
9 changed files with 1 additions and 83 deletions

View File

@ -406,8 +406,6 @@ dummy:
# #
# Set this to true to enable File access via NFS. Requires an MDS role. # Set this to true to enable File access via NFS. Requires an MDS role.
#nfs_file_gw: true #nfs_file_gw: true
# Set this to true to enable Object access via NFS. Requires an RGW role.
#nfs_obj_gw: false
# this is only here for usage with the rolling_update.yml playbook # this is only here for usage with the rolling_update.yml playbook
# do not ever change this here # do not ever change this here

View File

@ -23,7 +23,6 @@ dummy:
####################### #######################
# Access type options # # Access type options #
####################### #######################
# These are currently in ceph-common defaults because nfs_obj_gw shared with ceph-rgw
# Enable NFS File access # Enable NFS File access
#nfs_file_gw: true #nfs_file_gw: true
# Enable NFS Object access # Enable NFS Object access

View File

@ -398,8 +398,6 @@ mon_containerized_default_ceph_conf_with_kv: false
# #
# Set this to true to enable File access via NFS. Requires an MDS role. # Set this to true to enable File access via NFS. Requires an MDS role.
nfs_file_gw: true nfs_file_gw: true
# Set this to true to enable Object access via NFS. Requires an RGW role.
nfs_obj_gw: false
# this is only here for usage with the rolling_update.yml playbook # this is only here for usage with the rolling_update.yml playbook
# do not ever change this here # do not ever change this here

View File

@ -60,5 +60,5 @@
- ppa:gluster/nfs-ganesha-2.5 - ppa:gluster/nfs-ganesha-2.5
changed_when: false changed_when: false
when: when:
- (nfs_obj_gw or nfs_file_gw) - nfs_file_gw
- not ansible_distribution == "Debian" - not ansible_distribution == "Debian"

View File

@ -122,16 +122,6 @@
- nfs_group_name in group_names - nfs_group_name in group_names
- nfs_file_gw - nfs_file_gw
- name: install nfs rgw gateway
package:
name: "{{ item }}"
with_items:
- nfs-ganesha-rgw
- ceph-radosgw
when:
- nfs_group_name in group_names
- nfs_obj_gw
- name: install ceph mgr - name: install ceph mgr
package: package:
name: ceph-mgr name: ceph-mgr

View File

@ -15,11 +15,8 @@ cephx: true
####################### #######################
# Access type options # # Access type options #
####################### #######################
# These are currently in ceph-common defaults because nfs_obj_gw shared with ceph-rgw
# Enable NFS File access # Enable NFS File access
#nfs_file_gw: true #nfs_file_gw: true
# Enable NFS Object access
#nfs_obj_gw: false
###################### ######################
# NFS Ganesha Config # # NFS Ganesha Config #

View File

@ -7,18 +7,6 @@
group: root group: root
mode: 0644 mode: 0644
- name: create the nfs rgw user
docker:
image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
name: ceph-rgw-user-{{ ansible_hostname }}
hostname: "{{ ansible_hostname }}"
expose: "{{ ceph_rgw_civetweb_port }}"
ports: "{{ ceph_rgw_civetweb_port }}:{{ ceph_rgw_civetweb_port }}"
state: running
env: "CEPH_DAEMON=RGW_USER,RGW_USERNAME={{ ceph_nfs_rgw_user }},RGW_USER_ACCESS_KEY={{ ceph_nfs_rgw_access_key }},RGW_USER_SECRET_KEY={{ ceph_nfs_rgw_secret_key }}"
volumes: "/var/lib/ceph:/var/lib/ceph,/etc/ceph:/etc/ceph"
when: nfs_obj_gw
- name: get user create output - name: get user create output
command: docker logs ceph-rgw-user-{{ ansible_hostname }} command: docker logs ceph-rgw-user-{{ ansible_hostname }}
always_run: true always_run: true

View File

@ -10,21 +10,6 @@
- /var/lib/nfs/ganesha - /var/lib/nfs/ganesha
- /var/run/ganesha - /var/run/ganesha
- name: create rgw nfs user
command: radosgw-admin user create --uid={{ ceph_nfs_rgw_user }} --display-name="RGW NFS User"
register: rgwuser
when: nfs_obj_gw
- name: set access key
set_fact:
ceph_nfs_rgw_access_key: "{{ (rgwuser.stdout | from_json)['keys'][0]['access_key'] }}"
when: nfs_obj_gw
- name: set secret key
set_fact:
ceph_nfs_rgw_secret_key: "{{(rgwuser.stdout | from_json)['keys'][0]['secret_key']}}"
when: nfs_obj_gw
- name: generate ganesha configuration file - name: generate ganesha configuration file
action: config_template action: config_template
args: args:

View File

@ -1,37 +0,0 @@
---
- name: set config and keys paths
set_fact:
rgw_config_keys:
- "/var/lib/ceph/radosgw/{{ ansible_hostname }}/keyring"
when: nfs_obj_gw
- name: wait for rgw keyring
wait_for: path="/var/lib/ceph/radosgw/{{ ansible_hostname }}/keyring"
when:
- nfs_obj_gw
- inventory_hostname == groups[rgw_group_name][0]
- name: stat for config and keys
local_action: stat path={{ fetch_directory }}/docker_mon_files/{{ item }}
with_items: "{{ rgw_config_keys }}"
changed_when: false
become: false
failed_when: false
always_run: true
register: statconfig
when:
- nfs_obj_gw
- inventory_hostname == groups[rgw_group_name][0]
- name: push ceph files to the ansible server
fetch:
src: "{{ item.0 }}"
dest: "{{ fetch_directory }}/docker_mon_files/var/lib/ceph/radosgw/keyring"
flat: yes
with_together:
- "{{ rgw_config_keys }}"
- "{{ statconfig.results }}"
when:
- nfs_obj_gw
- item.1.stat.exists == false
- inventory_hostname == groups[rgw_group_name][0]