Merge pull request #960 from ceph/prepare-lrbd

iscsi-gw: preparing the new iscsi role

Vagrantfile

@@ -15,6 +15,7 @@ NNFSS          = settings['nfs_vms']
 RESTAPI        = settings['restapi']
 NRBD_MIRRORS   = settings['rbd_mirror_vms']
 CLIENTS        = settings['client_vms']
+NISCSI_GWS     = settings['iscsi_gw_vms']
 SUBNET         = settings['subnet']
 BOX            = settings['vagrant_box']
 BOX_URL        = settings['vagrant_box_url']
@@ -55,7 +56,8 @@ ansible_provision = proc do |ansible|
     'rgws'            => (0..NRGWS - 1).map { |j| "#{OSPREFIX}rgw#{j}" },
     'nfss'            => (0..NNFSS - 1).map { |j| "#{OSPREFIX}nfs#{j}" },
     'rbd_mirrors'     => (0..NRBD_MIRRORS - 1).map { |j| "#{OSPREFIX}rbd_mirror#{j}" },
-    'clients'         => (0..CLIENTS - 1).map { |j| "#{OSPREFIX}client#{j}" }
+    'clients'         => (0..CLIENTS - 1).map { |j| "#{OSPREFIX}client#{j}" },
+    'iscsi_gw'        => (0..NISCSI_GWS - 1).map { |j| "#{OSPREFIX}iscsi_gw#{j}" }
   }
 
   if RESTAPI then
@@ -283,6 +285,34 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     end
   end
 
+  (0..NISCSI_GWS - 1).each do |i|
+    config.vm.define "#{OSPREFIX}iscsi_gw#{i}" do |iscsi_gw|
+      iscsi_gw.vm.hostname = "#{OSPREFIX}ceph-iscsi-gw#{i}"
+      if !OSVM
+        iscsi_gw.vm.network :private_network, ip: "#{SUBNET}.9#{i}"
+      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|
+        lv.memory = MEMORY
+      end
+      # Parallels
+      iscsi_gw.vm.provider "parallels" do |prl|
+        prl.name = "ceph-iscsi-gw#{i}"
+        prl.memory = "#{MEMORY}"
+      end
+    end
+  end
+
   (0..NMONS - 1).each do |i|
     config.vm.define "#{OSPREFIX}mon#{i}" do |mon|
       mon.vm.hostname = "#{OSPREFIX}ceph-mon#{i}"

group_vars/all.sample

@@ -28,6 +28,7 @@ dummy:
 #restapi_group_name: restapis
 #rbdmirror_group_name: rbdmirrors
 #client_group_name: clients
+#iscsi_group_name: iscsigws
 
 # If check_firewall is true, then ansible will try to determine if the
 # Ceph ports are blocked by a firewall. If the machine running ansible

group_vars/iscsi-gws.sample

@@ -0,0 +1,10 @@
+---
+# Variables here are applicable to all host groups NOT roles
+
+# This sample file generated by generate_group_vars_sample.sh
+
+# Dummy variable to avoid error because ansible does not recognize the
+# file as a good configuration file when no variable in it.
+dummy:
+
+

roles/ceph-common/defaults/main.yml

@@ -20,6 +20,7 @@ nfs_group_name: nfss
 restapi_group_name: restapis
 rbdmirror_group_name: rbdmirrors
 client_group_name: clients
+iscsi_group_name: iscsigws
 
 # If check_firewall is true, then ansible will try to determine if the
 # Ceph ports are blocked by a firewall. If the machine running ansible

roles/ceph-iscsi-gw/defaults/main.yml

@@ -0,0 +1 @@
+---

roles/ceph-iscsi-gw/meta/main.yml

@@ -0,0 +1 @@
+---

roles/ceph-iscsi-gw/tasks/main.yml

@@ -0,0 +1 @@
+---

site.yml.sample

@@ -45,3 +45,8 @@
   become: True
   roles:
   - ceph-client
+
+- hosts: iscsigws
+  become: True
+  roles:
+  - ceph-iscsi-gw

vagrant_variables.yml.sample

@@ -11,6 +11,7 @@ rgw_vms: 0
 nfs_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
+iscsi_gw_vms: 0
 
 # Deploy RESTAPI on each of the Monitors
 restapi: true