drop iscsigw support

This service is no longer maintained. Let's drop its support within ceph-ansible. Signed-off-by: Guillaume Abrioux <[email protected]>
ceph · Mar 7, 2024 · dc75923 · dc75923
1 parent 05c4d17
commit dc75923
Show file tree

Hide file tree

Showing 124 changed files with 5 additions and 2,356 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -66,7 +66,6 @@ It means if you are pushing a patch modifying one of these files:
 - `./roles/ceph-nfs/defaults/main.yml`
 - `./roles/ceph-client/defaults/main.yml`
 - `./roles/ceph-common/defaults/main.yml`
-- `./roles/ceph-iscsi-gw/defaults/main.yml`
 - `./roles/ceph-mon/defaults/main.yml`
 - `./roles/ceph-rgw/defaults/main.yml`
 - `./roles/ceph-container-common/defaults/main.yml`

diff --git a/Vagrantfile b/Vagrantfile
@@ -24,7 +24,6 @@ NNFSS           = settings['nfs_vms']
 GRAFANA         = settings['grafana_server_vms']
 NRBD_MIRRORS    = settings['rbd_mirror_vms']
 CLIENTS         = settings['client_vms']
-NISCSI_GWS      = settings['iscsi_gw_vms']
 MGRS            = settings['mgr_vms']
 PUBLIC_SUBNET   = settings['public_subnet']
 CLUSTER_SUBNET  = settings['cluster_subnet']
@@ -67,7 +66,6 @@ ansible_provision = proc do |ansible|
     'nfss'             => (0..NNFSS - 1).map { |j| "#{LABEL_PREFIX}nfs#{j}" },
     'rbd_mirrors'      => (0..NRBD_MIRRORS - 1).map { |j| "#{LABEL_PREFIX}rbd_mirror#{j}" },
     'clients'          => (0..CLIENTS - 1).map { |j| "#{LABEL_PREFIX}client#{j}" },
-    'iscsigws'         => (0..NISCSI_GWS - 1).map { |j| "#{LABEL_PREFIX}iscsi_gw#{j}" },
     'mgrs'             => (0..MGRS - 1).map { |j| "#{LABEL_PREFIX}mgr#{j}" },
     'monitoring'   => (0..GRAFANA - 1).map { |j| "#{LABEL_PREFIX}grafana#{j}" }
   }
@@ -560,50 +558,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     end
   end
 
-  (0..NISCSI_GWS - 1).each do |i|
-    config.vm.define "#{LABEL_PREFIX}iscsi-gw#{i}" do |iscsi_gw|
-      iscsi_gw.vm.hostname = "#{LABEL_PREFIX}iscsi-gw#{i}"
-      if ASSIGN_STATIC_IP && !IPV6
-	  iscsi_gw.vm.network :private_network,
-          :ip => "#{PUBLIC_SUBNET}.#{$last_ip_pub_digit+=1}"
-      end
-      # Virtualbox
-      iscsi_gw.vm.provider :virtualbox do |vb|
-        vb.customize ['modifyvm', :id, '--memory', "#{MEMORY}"]
-      end
-
-      # VMware
-      iscsi_gw.vm.provider :vmware_fusion do |v|
-        v.vmx['memsize'] = "#{MEMORY}"
-      end
-
-      # Libvirt
-      iscsi_gw.vm.provider :libvirt do |lv,override|
-        lv.memory = MEMORY
-        lv.random_hostname = true
-	if IPV6 then
-          override.vm.network :private_network,
-	  :libvirt__ipv6_address => "#{PUBLIC_SUBNET}",
-	  :libvirt__ipv6_prefix => "64",
-	  :libvirt__dhcp_enabled => false,
-	  :libvirt__forward_mode => "veryisolated",
-	  :libvirt__network_name => "ipv6-public-network",
-	  :ip => "#{PUBLIC_SUBNET}#{$last_ip_pub_digit+=1}",
-	  :netmask => "64"
-	end
-      end
-      # Parallels
-      iscsi_gw.vm.provider "parallels" do |prl|
-        prl.name = "iscsi-gw#{i}"
-        prl.memory = "#{MEMORY}"
-      end
-
-      iscsi_gw.vm.provider :linode do |provider|
-        provider.label = iscsi_gw.vm.hostname
-      end
-    end
-  end
-
   (0..NOSDS - 1).each do |i|
     config.vm.define "#{LABEL_PREFIX}osd#{i}" do |osd|
       osd.vm.hostname = "#{LABEL_PREFIX}osd#{i}"

diff --git a/contrib/vagrant_variables.yml.atomic b/contrib/vagrant_variables.yml.atomic
@@ -10,7 +10,6 @@ rgw_vms: 0
 nfs_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
-iscsi_gw_vms: 0
 mgr_vms: 0
 
 # SUBNETS TO USE FOR THE VMS

diff --git a/contrib/vagrant_variables.yml.linode b/contrib/vagrant_variables.yml.linode
@@ -27,7 +27,6 @@ rgw_vms: 0
 nfs_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
-iscsi_gw_vms: 0
 
 # The sync directory changes based on vagrant box
 # Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant

diff --git a/contrib/vagrant_variables.yml.openstack b/contrib/vagrant_variables.yml.openstack
@@ -11,7 +11,6 @@ rgw_vms: 0
 nfs_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
-iscsi_gw_vms: 0
 
 # SUBNET TO USE FOR THE VMS
 # Use whatever private subnet your Openstack VMs are given

diff --git a/dashboard.yml b/dashboard.yml
@@ -8,7 +8,6 @@
     - "{{ mgr_group_name|default('mgrs') }}"
     - "{{ rbdmirror_group_name|default('rbdmirrors') }}"
     - "{{ nfs_group_name|default('nfss') }}"
-    - "{{ iscsi_gw_group_name|default('iscsigws') }}"
     - "{{ monitoring_group_name|default('monitoring') }}"
   gather_facts: false
   become: true

diff --git a/docs/source/testing/scenarios.rst b/docs/source/testing/scenarios.rst
@@ -50,7 +50,6 @@ to follow (most of them are 1 line settings).
      nfs_vms: 0
      rbd_mirror_vms: 0
      client_vms: 0
-     iscsi_gw_vms: 0
      mgr_vms: 0
 
   For a deployment that needs 1 MON and 1 OSD, the list would look like:

diff --git a/generate_group_vars_sample.sh b/generate_group_vars_sample.sh
@@ -66,8 +66,6 @@ for role in "$basedir"/roles/ceph-*; do
     output="ceph-fetch-keys.yml.sample"
   elif [[ $rolename == "ceph-rbd-mirror" ]]; then
     output="rbdmirrors.yml.sample"
-  elif [[ $rolename == "ceph-iscsi-gw" ]]; then
-    output="iscsigws.yml.sample"
   elif [[ $rolename == "ceph-rgw-loadbalancer" ]]; then
     output="rgwloadbalancers.yml.sample"
   else

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
@@ -54,7 +54,6 @@ dummy:
 #nfs_group_name: nfss
 #rbdmirror_group_name: rbdmirrors
 #client_group_name: clients
-#iscsi_gw_group_name: iscsigws
 #mgr_group_name: mgrs
 #rgwloadbalancer_group_name: rgwloadbalancers
 #monitoring_group_name: monitoring
@@ -66,7 +65,6 @@ dummy:
 #  - "{{ nfs_group_name }}"
 #  - "{{ rbdmirror_group_name }}"
 #  - "{{ client_group_name }}"
-#  - "{{ iscsi_gw_group_name }}"
 #  - "{{ mgr_group_name }}"
 #  - "{{ rgwloadbalancer_group_name }}"
 #  - "{{ monitoring_group_name }}"
@@ -84,7 +82,6 @@ dummy:
 #ceph_mds_firewall_zone: public
 #ceph_nfs_firewall_zone: public
 #ceph_rbdmirror_firewall_zone: public
-#ceph_iscsi_firewall_zone: public
 #ceph_dashboard_firewall_zone: public
 #ceph_rgwloadbalancer_firewall_zone: public
 
@@ -218,8 +215,6 @@ dummy:
 # flavors so far include: ceph_main, ceph_jewel, ceph_kraken, ceph_luminous
 #nfs_ganesha_flavor: "ceph_main"
 
-#ceph_iscsi_config_dev: true # special repo for deploying iSCSI gateways
-
 
 # REPOSITORY: CUSTOM
 #
@@ -703,75 +698,6 @@ dummy:
 #alertmanager_cluster_port: 9094
 #alertmanager_conf_overrides: {}
 #alertmanager_dashboard_api_no_ssl_verify: "{{ true if dashboard_protocol == 'https' and not dashboard_crt and not dashboard_key else false }}"
-# igw
-#
-# `igw_network` variable is intended for allowing dashboard deployment with iSCSI node not residing in the same subnet than what is defined in `public_network`.
-# For example:
-# If the ceph public network is 2a00:8a60:1:c301::/64 and the iSCSI Gateway resides
-# at a dedicated gateway network (2a00:8a60:1:c300::/64) (With routing between those networks).
-# It means "{{ hostvars[item]['ansible_facts']['all_ipv4_addresses'] | ips_in_ranges(public_network.split(',')) | last | ansible.utils.ipwrap }}" will be empty.
-# As a consequence, this prevent from deploying dashboard with iSCSI node when it reside in a subnet different than `public_network`.
-# Using `igw_network` make it possible, set it with the subnet used by your iSCSI node.
-#igw_network: "{{ public_network }}"
-
-
-##################################
-# DEPRECIATED iSCSI TARGET SETUP #
-##################################
-
-# WARNING #
-
-# The following values are depreciated. To setup targets, gateways, LUNs, and
-# clients you should use gwcli or dashboard. If the following values are set,
-# the old ceph-iscsi-config/ceph-iscsi-cli packages will be used.
-
-# Specify the iqn for ALL gateways. This iqn is shared across the gateways, so an iscsi
-# client sees the gateway group as a single storage subsystem.
-#gateway_iqn: ""
-
-# gateway_ip_list provides a list of the IP Addrresses - one per gateway - that will be used
-# as an iscsi target portal ip. The list must be comma separated - and the order determines
-# the sequence of TPG's within the iscsi target across each gateway. Once set, additional
-# gateways can be added, but the order must *not* be changed.
-#gateway_ip_list: 0.0.0.0
-
-# rbd_devices defines the images that should be created and exported from the iscsi gateways.
-# If the rbd does not exist, it will be created for you. In addition you may increase the
-# size of rbd's by changing the size parameter and rerunning the playbook. A size value lower
-# than the current size of the rbd is ignored.
-#
-# the 'host' parameter defines which of the gateway nodes should handle the physical
-# allocation/expansion or removal of the rbd
-# to remove an image, simply use a state of 'absent'. This will first check the rbd is not allocated
-# to any client, and the remove it from LIO and then delete the rbd image
-#
-# NB. this variable definition can be commented out to bypass LUN management
-#
-# Example:
-#
-# rbd_devices:
-#   - { pool: 'rbd', image: 'ansible1', size: '30G', host: 'ceph-1', state: 'present' }
-#   - { pool: 'rbd', image: 'ansible2', size: '15G', host: 'ceph-1', state: 'present' }
-#   - { pool: 'rbd', image: 'ansible3', size: '30G', host: 'ceph-1', state: 'present' }
-#   - { pool: 'rbd', image: 'ansible4', size: '50G', host: 'ceph-1', state: 'present' }
-#rbd_devices: {}
-
-# client_connections defines the client ACL's to restrict client access to specific LUNs
-# The settings are as follows;
-# - image_list is a comma separated list of rbd images of the form <pool name>.<rbd_image_name>
-# - chap supplies the user and password the client will use for authentication of the
-#   form <user>/<password>
-# - status shows the intended state of this client definition - 'present' or 'absent'
-#
-# NB. this definition can be commented out to skip client (nodeACL) management
-#
-# Example:
-#
-# client_connections:
-#   - { client: 'iqn.1994-05.com.redhat:rh7-iscsi-client', image_list: 'rbd.ansible1,rbd.ansible2', chap: 'rh7-iscsi-client/redhat', status: 'present' }
-#   - { client: 'iqn.1991-05.com.microsoft:w2k12r2', image_list: 'rbd.ansible4', chap: 'w2k12r2/microsoft_w2k12', status: 'absent' }
-
-#client_connections: {}
 
 #no_log_on_ceph_key_tasks: true
 

diff --git a/group_vars/iscsigws.yml.sample b/group_vars/iscsigws.yml.sample