Commit afa0404c authored by Karol Latecki's avatar Karol Latecki Committed by Tomasz Zawadzki
Browse files

Revert "scripts/vagrant: Remove inline shell scripts" 



This reverts commit 436b9be9.

Reason:
these change makes Vagrantfile rely on env variables (eg. spdk_dir),
which are only set when running scripts/vagrant/create_vbox.sh script.
After create_vbox.sh has finished env variables are not accessible,
but still needed to work with Vagrantfile using Vagrant commands
like 'vagrant ssh' or 'vagrant reload', etc. This results in
configuration errors from Vagrant and scripts being unusable.

Signed-off-by: default avatarKarol Latecki <karol.latecki@intel.com>
Change-Id: I135c42d248c13dfa93c2210dabce49df8116e8f0
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3055


Reviewed-by: default avatarMaciej Wawryk <maciejx.wawryk@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
parent cb98b2ab

scripts/vagrant/Vagrantfile

+32 −17
Original line number Diff line number Diff line
@@ -74,11 +74,14 @@ Vagrant.configure(2) do |config| 


  # Copy the tsocks configuration file for use when installing some spdk test pool dependencies

  if File.file?("/etc/tsocks.conf")

    $tsocks_copy = <<-SCRIPT

    sudo -s

    mv -f tsocks.conf /etc/tsocks.conf

    chown root /etc/tsocks.conf

    chmod 644 /etc/tsocks.conf

    SCRIPT

    config.vm.provision  "file", source: "/etc/tsocks.conf", destination: "tsocks.conf"

    config.vm.provision "shell" do |setup|

      setup.path = "#{spdk_dir}/scripts/vagrant/vagrantfiles/tsocks_setup.sh"

      setup.privileged = true

    end

    config.vm.provision "shell", inline: $tsocks_copy

  end



  # vagrant-cachier caches apt/yum etc to speed subsequent
@@ -102,11 +105,15 @@ Vagrant.configure(2) do |config| 
    # Proxyconf does not seem to support FreeBSD boxes or at least it's

    # docs do not mention that. Set up proxy configuration manually.

    if distro.include?("freebsd")

      config.vm.provision "shell" do |setup|

        setup.path = "#{spdk_dir}/scripts/vagrant/vagrantfiles/freebsd_proxy.sh"

        setup.privileged = true

        setup.args = ["#{ENV['http_proxy']}"]

      end

      $freebsd_proxy = <<-SCRIPT

      sudo -s

      echo "export http_proxy=#{ENV['http_proxy']}" >> /etc/profile

      echo "export https_proxy=#{ENV['http_proxy']}" >> /etc/profile

      echo "pkg_env: {http_proxy: #{ENV['http_proxy']}}" > /usr/local/etc/pkg.conf

      chown root:wheel /usr/local/etc/pkg.conf

      chmod 644 /usr/local/etc/pkg.conf

      SCRIPT

      config.vm.provision "shell", inline: $freebsd_proxy

    end

  end
@@ -115,10 +122,14 @@ Vagrant.configure(2) do |config| 
  # To make sources usable in the guest VM we need to unmount them and use

  # local copy.

  if distro.include?("freebsd")

    config.vm.provision "shell" do |setup|

      setup.path = "#{spdk_dir}/scripts/vagrant/vagrantfiles/freebsd_spdk_repo.sh"

      setup.privileged = true

    end

    $freebsd_spdk_repo = <<-SCRIPT

    sudo -s

    cp -R /home/vagrant/spdk_repo/spdk /tmp/spdk

    umount /home/vagrant/spdk_repo/spdk && rm -rf /home/vagrant/spdk_repo/spdk

    mv /tmp/spdk /home/vagrant/spdk_repo/spdk

    chown -R vagrant:vagrant /home/vagrant/spdk_repo/spdk

    SCRIPT

    config.vm.provision "shell", inline: $freebsd_spdk_repo

  end



  config.ssh.forward_agent = true
@@ -241,10 +252,14 @@ Vagrant.configure(2) do |config| 


  # Clear CFLAGS in clear linux

  if distro == "clearlinux"

    config.vm.provision "shell" do |setup|

      setup.path = "#{spdk_dir}/scripts/vagrant/vagrantfiles/clearlinux_cflags.sh"

      setup.privileged = false

    end

    $clearcflags = <<-SCRIPT

    echo "export CFLAGS=" >> /etc/profile.d/clearcflags.sh

    echo "export CFFLAGS=" >> /etc/profile.d/clearcflags.sh

    echo "export CXXFLAGS=" >> /etc/profile.d/clearcflags.sh

    echo "export FFLAGS=" >> /etc/profile.d/clearcflags.sh

    echo "export THEANO_FLAGS=" >> /etc/profile.d/clearcflags.sh

    SCRIPT

    config.vm.provision "shell", inline: $clearcflags, run: "always"

  end



  # Copy in the user's tools if they exists

scripts/vagrant/vagrantfiles/clearlinux_cflags.sh

deleted100755 → 0
+0 −9
Original line number Diff line number Diff line 
#!/usr/bin/env bash



cat <<- FLAGS >> /etc/profile.d/clearcflags.sh

	export CFLAGS=

	export CFFLAGS=

	export CXXFLAGS=

	export FFLAGS=

	export THEANO_FLAGS=

FLAGS

scripts/vagrant/vagrantfiles/freebsd_proxy.sh

deleted100755 → 0
+0 −11
Original line number Diff line number Diff line 
#!/usr/bin/env bash



http_proxy=$1



cat <<- PROXY >> /etc/profile

	export http_proxy=${http_proxy}

	export https_proxy=${http_proxy}

PROXY

echo "pkg_env: {http_proxy: ${http_proxy}" > /usr/local/etc/pkg.conf

chown root:wheel /usr/local/etc/pkg.conf

chmod 644 /usr/local/etc/pkg.conf

scripts/vagrant/vagrantfiles/freebsd_spdk_repo.sh

deleted100755 → 0
+0 −6
Original line number Diff line number Diff line 
#!/usr/bin/env bash



cp -R /home/vagrant/spdk_repo/spdk /tmp/spdk

umount /home/vagrant/spdk_repo/spdk && rm -rf /home/vagrant/spdk_repo/spdk

mv /tmp/spdk /home/vagrant/spdk_repo/spdk

chown -R vagrant:vagrant /home/vagrant/spdk_repo/spdk

scripts/vagrant/vagrantfiles/tsocks_setup.sh

deleted100755 → 0
+0 −5
Original line number Diff line number Diff line 
#!/usr/bin/env bash



mv -f tsocks.conf /etc/tsocks.conf

chown root /etc/tsocks.conf

chmod 644 /etc/tsocks.conf