X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=Vagrantfile;h=8ab75edeede568e2460268144f360deff34b7237;hb=8fcb874a6e5ec52b4a6ac80cb7f34c7baccd8c17;hp=656c25cac52c7e703b3864a3f002dd876ea1aeb6;hpb=7d9a147be328eb6fa90d64ef845635d506601d12;p=icn.git diff --git a/Vagrantfile b/Vagrantfile index 656c25c..8ab75ed 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -16,12 +16,17 @@ site = ENV['ICN_SITE'] || 'vm' # IPMI address) specified in the machine pool values. IPMI in the # virtual environment is emulated by virtualbmc listening on the host. baremetal_cidr = nil +registry_mirrors = nil Dir.glob("deploy/site/#{site}/*.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? - bmc_host = URI.parse(values['bmcAddress']).host - baremetal_cidr = "#{IPAddr.new(bmc_host).mask(24)}/24" + 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? @@ -102,7 +107,7 @@ Vagrant.configure("2") do |config| m.trigger.after [:up] do |trigger| trigger.name = 'Creating ICN user_config.sh' - trigger.run = {inline: "./tools/vagrant/create_user_config.sh"} + trigger.run = {inline: "bash -c 'DOCKER_REGISTRY_MIRRORS=\"#{registry_mirrors}\" ./tools/vagrant/create_user_config.sh'"} end m.vm.provision 'Configuring ICN prerequisites', type: 'shell', privileged: true, inline: <<-SHELL ssh-keygen -f "${HOME}/.ssh/id_rsa" -P "" <<