Update Packer Vagrantfile for new versions

Also refactor with better loops to be more clean.

Also remove F24 and Beryllium entries.

Change-Id: I2d137f68643b2c58c80c2781a95663051fba85a8
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>

diff --git a/packer/Vagrantfile b/packer/Vagrantfile
index 072fcb9f3428210bed489ba0b84aa9bf0cb1235b..a891652cc10e03e4f4045127b601b0c7ffe85ba6 100644 (file)
--- a/packer/Vagrantfile
+++ b/packer/Vagrantfile
@@ -31,37 +31,12 @@ Vagrant.configure(2) do |config|
   # VirtualBox and CentOS
   #
 
-  # Beryllium Release through SR4
-  (0..4).each do |i|
-    config.vm.define "cent_odl4#{i}_vb" do |cent_odl_vb|
-      cent_odl_vb.vm.box = "cent_odl4#{i}_vb"
-      cent_odl_vb.vm.box_url = "file://opendaylight-4.#{i}.0-centos-7.3.1611-virtualbox.box"
-    end
-  end
-
-  # Boron Release
-  (0..2).each do |i|
-    config.vm.define "cent_odl5#{i}_vb" do |cent_odl_vb|
-      cent_odl_vb.vm.box = "cent_odl5#{i}_vb"
-      cent_odl_vb.vm.box_url = "file://opendaylight-5.#{i}.0-centos-7.3.1611-virtualbox.box"
-    end
-  end
-
-  #
-  # VirtualBox and Fedora 24
-  #
-
-  (0..4).each do |i|
-    config.vm.define "f24_odl4#{i}_vb" do |f24_odl_vb|
-      f24_odl_vb.vm.box = "f24_odl4#{i}_vb"
-      f24_odl_vb.vm.box_url = "file://opendaylight-4.#{i}.0-fedora-24-virtualbox.box"
-    end
-  end
-
-  (0..2).each do |i|
-    config.vm.define "f24_odl5#{i}_vb" do |f24_odl_vb|
-      f24_odl_vb.vm.box = "f24_odl5#{i}_vb"
-      f24_odl_vb.vm.box_url = "file://opendaylight-5.#{i}.0-fedora-24-virtualbox.box"
+  (5..6).each do |major|
+    (0..4).each do |minor|
+      config.vm.define "cent_odl#{major}#{minor}_vb" do |cent_vb|
+        cent_vb.vm.box = "cent_odl#{major}#{minor}_vb"
+        cent_vb.vm.box_url = "file://opendaylight-#{major}.#{minor}.0-centos-7.3.1611-virtualbox.box"
+      end
     end
   end
 
@@ -69,17 +44,12 @@ Vagrant.configure(2) do |config|
   # VirtualBox and Fedora 25
   #
 
-  (0..4).each do |i|
-    config.vm.define "f25_odl4#{i}_vb" do |f25_odl_vb|
-      f25_odl_vb.vm.box = "f25_odl4#{i}_vb"
-      f25_odl_vb.vm.box_url = "file://opendaylight-4.#{i}.0-fedora-25-virtualbox.box"
-    end
-  end
-
-  (0..2).each do |i|
-    config.vm.define "f25_odl5#{i}_vb" do |f25_odl_vb|
-      f25_odl_vb.vm.box = "f25_odl5#{i}_vb"
-      f25_odl_vb.vm.box_url = "file://opendaylight-5.#{i}.0-fedora-25-virtualbox.box"
+  (5..6).each do |major|
+    (0..4).each do |minor|
+      config.vm.define "f25_odl#{major}#{minor}_vb" do |f25_vb|
+        f25_vb.vm.box = "f25_odl#{major}#{minor}_vb"
+        f25_vb.vm.box_url = "file://opendaylight-#{major}.#{minor}.0-fedora-25-virtualbox.box"
+      end
     end
   end
 
@@ -91,37 +61,12 @@ Vagrant.configure(2) do |config|
   # LibVirt and CentOS
   #
 
-  # Beryllium Release through SR4
-  (0..4).each do |i|
-    config.vm.define "cent_odl4#{i}_lv" do |cent_odl_lv|
-      cent_odl_lv.vm.box = "cent_odl4#{i}_lv"
-      cent_odl_lv.vm.box_url = "file://opendaylight-4.#{i}.0-centos-7.3.1611-libvirt.box"
-    end
-  end
-
-  # Boron Release
-  (0..2).each do |i|
-    config.vm.define "cent_odl5#{i}_lv" do |cent_odl_lv|
-      cent_odl_lv.vm.box = "cent_odl5#{i}_lv"
-      cent_odl_lv.vm.box_url = "file://opendaylight-5.#{i}.0-centos-7.3.1611-libvirt.box"
-    end
-  end
-
-  #
-  # LibVirt and Fedora 24
-  #
-
-  (0..4).each do |i|
-    config.vm.define "f24_odl4#{i}_lv" do |f24_odl_lv|
-      f24_odl_lv.vm.box = "f24_odl4#{i}_lv"
-      f24_odl_lv.vm.box_url = "file://opendaylight-4.#{i}.0-fedora-24-libvirt.box"
-    end
-  end
-
-  (0..2).each do |i|
-    config.vm.define "f24_odl5#{i}_lv" do |f24_odl_lv|
-      f24_odl_lv.vm.box = "f24_odl5#{i}_lv"
-      f24_odl_lv.vm.box_url = "file://opendaylight-5.#{i}.0-fedora-24-libvirt.box"
+  (5..6).each do |major|
+    (0..4).each do |minor|
+      config.vm.define "cent_odl#{major}#{minor}_lv" do |cent_lv|
+        cent_lv.vm.box = "cent_odl#{major}#{minor}_lv"
+        cent_lv.vm.box_url = "file://opendaylight-#{major}.#{minor}.0-centos-7.3.1611-libvirt.box"
+      end
     end
   end
 
@@ -129,18 +74,12 @@ Vagrant.configure(2) do |config|
   # LibVirt and Fedora 25
   #
 
-  (0..4).each do |i|
-    config.vm.define "f25_odl4#{i}_lv" do |f25_odl_lv|
-      f25_odl_lv.vm.box = "f25_odl4#{i}_lv"
-      f25_odl_lv.vm.box_url = "file://opendaylight-4.#{i}.0-fedora-25-libvirt.box"
-    end
-  end
-
-  (0..2).each do |i|
-    config.vm.define "f25_odl5#{i}_lv" do |f25_odl_lv|
-      f25_odl_lv.vm.box = "f25_odl5#{i}_lv"
-      f25_odl_lv.vm.box_url = "file://opendaylight-5.#{i}.0-fedora-25-libvirt.box"
+  (5..6).each do |major|
+    (0..4).each do |minor|
+      config.vm.define "f25_odl#{major}#{minor}_lv" do |f25_lv|
+        f25_lv.vm.box = "f25_odl#{major}#{minor}_lv"
+        f25_lv.vm.box_url = "file://opendaylight-#{major}.#{minor}.0-fedora-25-libvirt.box"
+      end
     end
   end
 end
-