Vagrantfile: systematic use of name lv for libvirt provider
[obnox/vagrant/vagrant-gluster-samba-cluster.git] / Vagrantfile
index dfa6215fe132134cee2f51700a595b289ac3da46..94a876144fa66416d5d21668b1d29c1caebbeda9 100644 (file)
@@ -76,15 +76,6 @@ vms = [
   },
 ]
 
-# disks: hard-coded for all nodes for now:
-disks = [
-      {
-        :size => 1, # in GB
-      },
-      {
-        :size => 10,
-      },
-]
 
 #
 # Load the config, if it exists,
@@ -256,14 +247,55 @@ cat <<EOF >> ${FILE}
 EOF
 SCRIPT
 
+
+#
+# disks: hard-coded for all nodes for now:
+# TODO: make (some of) these configurable ...
+#
+disks = [
+      {
+        :size => 1, # in GB
+        #:volname => "gv0",
+      },
+      {
+        :size => 10,
+        #:volname => "gv1",
+      },
+]
+
 driveletters = ('b'..'z').to_a
 
+#brick_mount_prefix = "/export"
+brick_mount_prefix = "/bricks"
+brick_path_suffix = "brick"
+gluster_volume_prefix = "gv"
+gluster_mount_prefix = "/gluster"
+
 disks.each_with_index do |disk,disk_num|
   disk[:number] = disk_num
-  disk[:name][:libvirt] = "vd#{driveletters[disk[:number]]}"
-  disk[:name][:virtualbox] = "sd#{driveletters[disk[:number]]}"
+  disk[:volume_name] = "#{gluster_volume_prefix}#{disk[:number]}"
+  disk[:volume_mount_point] = "#{gluster_mount_prefix}/#{disk[:volume_name]}"
+  disk[:dev_names] = {
+    :libvirt => "vd#{driveletters[disk[:number]]}",
+    :virtualbox => "sd#{driveletters[disk[:number]]}",
+  }
+  disk[:dev_name] = "sd#{driveletters[disk[:number]]}"
+  disk[:brick_name] = "brick0"
+  disk[:label] = "#{disk[:volume_name]}-#{disk[:brick_name]}"
+  disk[:brick_mount_point] = "#{brick_mount_prefix}/#{disk[:label]}"
+  disk[:brick_path] = "#{disk[:brick_mount_point]}/#{brick_path_suffix}"
 end
 
+# /dev/{sv}db --> xfs filesys (on /dev/{sv}db1)
+#  --> mount unter /bricks/gv0
+#    --> dir /bricks/gv0/brick --> dir for gluster createvol gv0
+#      --> gluster/fuse mount /gluster/gv0
+
+
+my_config = {
+  :provider => :libvirt,
+}
+
 #
 # The vagrant machine definitions
 #
@@ -271,6 +303,7 @@ end
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   config.vm.synced_folder ".", "/vagrant", disabled: true
+  #config.vm.synced_folder './', '/vagrant', type: '9p', disabled: false, accessmode: "squash", owner: "vagrant"
 
   #if Vagrant.has_plugin?("vagrant-cachier")
   #  config.cache.scope = :machine
@@ -296,31 +329,29 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
       print "machine #{machine_num}: #{machine[:hostname]}\n"
 
-      node.vm.provider :libvirt do |libvirt|
-        libvirt.default_prefix = machine[:provider][:libvirt][:prefix]
-        libvirt.memory = 1024
-        #libvirt.storage :file, :size => '64M', :device => 'vdb'
-        #libvirt.storage :file, :size => '10G', :device => 'vdc'
+      node.vm.provider :libvirt do |lv|
+        lv.default_prefix = machine[:provider][:libvirt][:prefix]
+        lv.memory = 1024
       end
 
       node.vm.provider :virtualbox do |vb|
-        #vb.default_prefix = machine[:provider][:virtualbox][:prefix]
         vb.memory = 1024
       end
 
-      disks.each_with_index do |disk,disk_num|
-        #disk[:number] = disk_num
+      disks.each do |disk|
         node.vm.provider :libvirt do |lv|
-          #disk[:name] = "vd#{driveletters[disk[:number]]}"
-          #print " disk ##{disk[:number]}: #{disk[:name]}\n"
-          lv.storage :file, :size => '%{disk[:size]}G', :device => '#{disk[:name][:libvirt]}'
+          print " [libvirt] attaching disk ##{disk[:number]}: #{disk[:dev_name]}\n"
+          lv.storage :file, :size => "#{disk[:size]}G", :device => "#{disk[:dev_names][:libvirt]}"
+          #lv.storage :file, :size => "#{disk[:size]}G", :bus => "sata" , :device => "#{disk[:dev_name]}"
         end
         node.vm.provider :virtualbox do |vb|
-          #disk[:name] = "sd#{driveletters[disk[:number]]}"
-          #disk_file = "disk-#{machine_num}-#{disks[:name]}.vdi"
           disk_size = disk[:size]*1024
-          #vb.customize [ "createhd", "--filename", disk_file, "--size", disk_size ]
-          #vb.customize [ "storageattach", :id, "--storagectl", "SATA Controller", "--port", 3+disks[:number], "--device", 0, "--type", "hdd", "--medium", disk_file ]
+          #disk_file = "disk-#{machine_num}-#{disk[:dev_names][:virtualbox]}.vdi"
+          #print " [virtualbox] disk ##{disk[:number]}: #{disk[:dev_names][:virtualbox]}\n"
+          disk_file = "disk-#{machine_num}-#{disk[:dev_name]}.vdi"
+          print " [virtualbox] attaching disk ##{disk[:number]}: #{disk[:dev_name]}\n"
+          vb.customize [ "createhd", "--filename", disk_file, "--size", disk_size ]
+          vb.customize [ "storageattach", :id, "--storagectl", "SATA Controller", "--port", 3+disk[:number], "--device", 0, "--type", "hdd", "--medium", disk_file ]
         end
       end
 
@@ -365,24 +396,14 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       ###  s.args = [ '/gluster/gv0', '/gluster/gv1' ]
       ###end
 
-      # multiple privisioners with same name possible?
-
       disks.each do |disk|
-        node.vm.provision "disk_#{disk[:number]}", type: "shell" do |s|
-          s.path = "provision/shell/gluster/create-brick.sh"
-          s.args = [ disk[:name], "/export" ]
+        print " create_brick: size #{disk[:size]}G, label #{disk[:label]} under #{disk[:brick_mount_point]}\n"
+        node.vm.provision "create_brick_#{disk[:number]}", type: "shell" do |s|
+          s.path = "provision/shell/gluster/create-brick.v2.sh"
+          s.args = [ "#{disk[:size]}G", disk[:label], disk[:brick_mount_point], brick_path_suffix ]
         end
       end
       
-      ###node.vm.provision "xfs_0", type: "shell" do |s|
-      ###  s.path = "provision/shell/gluster/create-brick.sh"
-      ###  s.args = [ "vdb", "/export" ]
-      ###end
-
-      ###node.vm.provision "xfs_1", type: "shell" do |s|
-      ###  s.path = "provision/shell/gluster/create-brick.sh"
-      ###  s.args = [ "vdc", "/export" ]
-      ###end
 
       node.vm.provision "gluster_start", type: "shell" do |s|
         s.path = "provision/shell/gluster/gluster-start.sh"
@@ -403,23 +424,20 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
 
       disks.each do |disk|
-        vol_name = "gv#{disk[:number]}"
-        vol_mount_point = "/gluster/#{vol_name}"
-
         brick_mount_points = cluster_internal_ips.map do |ip|
-          "#{ip}:/export/#{disk[:name]}1/brick"
+          "#{ip}:#{disk[:brick_path]}"
         end
-
-        print " brick mount points: #{brick_mount_points}\n"
+        
+        print " brick directories: #{brick_mount_points}\n"
 
         node.vm.provision "gluster_createvol_#{disk[:number]}", type: "shell" do |s|
           s.path = "provision/shell/gluster/gluster-create-volume.sh"
-          s.args = [ vol_name, "3" ] + brick_mount_points
+          s.args = [ disk[:volume_name], "3" ] + brick_mount_points
         end
 
         node.vm.provision "gluster_mount_#{disk[:number]}", type: "shell" do |s|
           s.path = "provision/shell/gluster/gluster-mount-volume.sh"
-          s.args = [ vol_name, vol_mount_point ]
+          s.args = [ disk[:volume_name], disk[:volume_mount_point] ]
         end
       end