X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=Vagrantfile;h=6d60f7d5e309473a3c3c2f5996e8107e3bfa4132;hb=refs%2Fchanges%2F07%2F4807%2F1;hp=abc29f1e055986713b85168560d5d4dc9d0d2c65;hpb=95ca9e9192a22bb3172c373cdb611297fef5cfd6;p=icn.git

diff --git a/Vagrantfile b/Vagrantfile
index abc29f1..6d60f7d 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -16,24 +16,52 @@ with_jenkins = ENV['WITH_JENKINS'] || false
 # Calculate the baremetal network address from the bmcAddress (aka
 # IPMI address) specified in the machine pool values.  IPMI in the
 # virtual environment is emulated by virtualbmc listening on the host.
-baremetal_cidr = nil
+baremetal4_gw = '192.168.151.1'
+baremetal4_netmask = '255.255.255.0'
+baremetal6_gw = nil
+baremetal6_prefix = nil
+bmc_host = '192.168.121.1' # From the default vagrant-libvirt network
 registry_mirrors = nil
-Dir.glob("deploy/site/#{site}/*.yaml") do |file|
+Dir.glob("deploy/site/#{site}/deployment/*.yaml") do |file|
   YAML.load_stream(File.read(file)) do |document|
     values = document.fetch('spec', {}).fetch('values', {})
+    unless values['networkData'].nil? or values['networkData']['networks'].nil?
+      networks = values['networkData']['networks']
+      unless networks['ipv4'].nil?
+        networks['ipv4'].select {|name,network| network.fetch('link', name) == 'baremetal'}.each_value do |network|
+          if network.key?('gateway')
+            baremetal4_gw = network['gateway']
+          elsif network.key?('fromIPPool')
+            pool = network['fromIPPool']
+            if values['ipPools']["#{pool}"].key?('gateway')
+              baremetal4_gw = values['ipPools']["#{pool}"]['gateway']
+            end
+          end
+        end
+      end
+      unless networks['ipv6'].nil?
+        networks['ipv6'].select {|name,network| network.fetch('link', name) == 'baremetal'}.each_value do |network|
+          if network.key?('gateway')
+            baremetal6_gw = network['gateway']
+            baremetal6_prefix = 64
+          elsif network.key?('fromIPPool')
+            pool = network['fromIPPool']
+            if values['ipPools']["#{pool}"].key?('gateway')
+              baremetal6_gw = values['ipPools']["#{pool}"]['gateway']
+              baremetal6_prefix = 64
+            end
+          end
+        end
+      end
+    end
     unless values['bmcAddress'].nil?
       bmc_host = URI.parse(values['bmcAddress']).host
-      baremetal_cidr = "#{IPAddr.new(bmc_host).mask(24)}/24"
     end
     unless values['dockerRegistryMirrors'].nil?
       registry_mirrors = values['dockerRegistryMirrors'].join(' ')
     end
   end
 end
-if baremetal_cidr.nil?
-  puts "Missing bmcAddress value in site definition, can't determine baremetal network address"
-  exit 1
-end
 
 $post_up_message = <<MSG
 ------------------------------------------------------
@@ -80,13 +108,21 @@ Vagrant.configure("2") do |config|
         libvirt.memory = 24576
       end
       libvirt.nested = true
+    end
 
-      # The ICN baremetal network is the vagrant management network,
-      # and is created by vagrant for us
-      libvirt.management_network_name = "#{site}-baremetal"
-      libvirt.management_network_address = baremetal_cidr
-      libvirt.management_network_autostart = true
+    # The ICN baremetal network will be a vagrant private network
+    # created upon bringing up the jump machine
+    m.trigger.before [:up] do |trigger|
+      trigger.name = 'Creating baremetal network'
+      trigger.run = {inline: "./tools/vagrant/create_baremetal_network.sh #{site} #{baremetal4_gw} #{baremetal4_netmask} #{baremetal6_gw} #{baremetal6_prefix}"}
     end
+    m.trigger.after [:destroy] do |trigger|
+      trigger.name = 'Destroying baremetal network'
+      trigger.run = {inline: "./tools/vagrant/destroy_baremetal_network.sh #{site}"}
+    end
+    m.vm.network :private_network,
+                 :libvirt__network_name => "#{site}-baremetal",
+                 :type => 'dhcp'
 
     # The ICN provisioning network will be a vagrant private network
     # created upon bringing up the jump machine
@@ -102,14 +138,14 @@ Vagrant.configure("2") do |config|
                  :libvirt__network_name => "#{site}-provisioning",
                  :type => 'dhcp'
 
-    # IPMI control of machines is provided by vbmc on the host
+    # BMC control of machines is provided by sushy-emulator on the host
     m.trigger.after [:up] do |trigger|
-      trigger.name = 'Starting virtualbmc for IPMI network'
-      trigger.run = {inline: "./tools/vagrant/start_vbmc.sh"}
+      trigger.name = 'Starting sushy for BMC network'
+      trigger.run = {inline: "./tools/vagrant/start_sushy.sh #{bmc_host}"}
     end
     m.trigger.after [:destroy] do |trigger|
-      trigger.name = 'Stopping virtualbmc for IPMI network'
-      trigger.run = {inline: "./tools/vagrant/stop_vbmc.sh"}
+      trigger.name = 'Stopping sushy for BMC network'
+      trigger.run = {inline: "./tools/vagrant/stop_sushy.sh #{bmc_host}"}
     end
 
     m.trigger.after [:up] do |trigger|
@@ -132,16 +168,25 @@ Vagrant.configure("2") do |config|
   # the values dictionary.  This will provide the values needed to
   # create the machine pool.
   legacy_machine_args = ""
-  Dir.glob("deploy/site/#{site}/*.yaml") do |file|
+  Dir.glob("deploy/site/#{site}/deployment/*.yaml") do |file|
     YAML.load_stream(File.read(file)) do |document|
       values = document.fetch('spec', {}).fetch('values', {})
       next if values['machineName'].nil? || values['bootMACAddress'].nil?
       machine_name = values['machineName']
       boot_mac_address = values['bootMACAddress']
+      baremetal_mac_address = nil
+      if values['networkData'] and
+          values['networkData']['links'] and
+          values['networkData']['links']['ethernets'] and
+          values['networkData']['links']['ethernets']['baremetal'] and
+          baremetal_mac_address = values['networkData']['links']['ethernets']['baremetal']['macAddress']
+      end
       bmc_port = URI.parse(values['bmcAddress']).port
+      uuid = URI.parse(values['bmcAddress']).path.split('/').last
       config.vm.define machine_name do |m|
         m.vm.hostname = machine_name
         m.vm.provider :libvirt do |libvirt|
+          libvirt.uuid = "#{uuid}"
           libvirt.graphics_ip = '0.0.0.0'
           libvirt.default_prefix = "#{site}-"
           libvirt.cpu_mode = 'host-passthrough'
@@ -162,18 +207,15 @@ Vagrant.configure("2") do |config|
                      :libvirt__network_name => "#{site}-provisioning",
                      :mac => boot_mac_address,
                      :type => 'dhcp'
-        m.vm.network :private_network,
-                     :libvirt__network_name => "#{site}-baremetal",
-                     :type => 'dhcp'
-
-        # IPMI control
-        m.trigger.after [:up] do |trigger|
-          trigger.name = 'Adding machine to IPMI network'
-          trigger.run = {inline: "./tools/vagrant/add_machine_to_vbmc.sh #{site} #{machine_name} #{bmc_port}"}
-        end
-        m.trigger.after [:destroy] do |trigger|
-          trigger.name = 'Removing machine from IPMI network'
-          trigger.run = {inline: "./tools/vagrant/remove_machine_from_vbmc.sh #{site} #{machine_name} #{bmc_port}"}
+        if baremetal_mac_address.nil?
+          m.vm.network :private_network,
+                       :libvirt__network_name => "#{site}-baremetal",
+                       :type => 'dhcp'
+        else
+          m.vm.network :private_network,
+                       :libvirt__network_name => "#{site}-baremetal",
+                       :mac => baremetal_mac_address,
+                       :type => 'dhcp'
         end
       end
     end