diff options
author | Jonas Bjurel <jonas.bjurel@ericsson.com> | 2016-09-17 00:12:33 +0200 |
---|---|---|
committer | Jonas Bjurel <jonas.bjurel@ericsson.com> | 2016-09-19 07:48:15 +0000 |
commit | e8d748cd655937bed234fc02f2f8e3406d96f4dc (patch) | |
tree | 75e9930840f1688140c97ac37a36b4dfab1a8a4b /build/vagrant | |
parent | 269773ffd3bbd267aeee21b49f83783c064c04c6 (diff) |
Repo tidy-up + licence scrubing
- Added licences and (c) to files not complying to Licence and (c) policies.
- Removed example templates not having correct licence claims and no longer being rellevant.
- Removed the Vagrant deployment method as it is not used, not rebased/up to date and not holding correct license claims.
Strategies used:
- Machine generated are not assigned an licence text, the licence follow from the source.
- Generated patch files are not assigned an licence text, the licence follow from the source.
Change-Id: I9763f076eae51fbb2d4e5cb8cacfa4bb6cf338cc
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
(cherry picked from commit 65b7cfcd862a75be72fb98777190c49f8b6ea0d3)
Diffstat (limited to 'build/vagrant')
-rw-r--r-- | build/vagrant/README.rst | 39 | ||||
-rw-r--r-- | build/vagrant/Vagrantfile | 23 | ||||
-rwxr-xr-x | build/vagrant/build_fuel.sh | 9 | ||||
-rwxr-xr-x | build/vagrant/setup_fuel.sh | 26 |
4 files changed, 0 insertions, 97 deletions
diff --git a/build/vagrant/README.rst b/build/vagrant/README.rst deleted file mode 100644 index 7db098dfa..000000000 --- a/build/vagrant/README.rst +++ /dev/null @@ -1,39 +0,0 @@ -================================= -Fuel@OPNFV Build Based on Vagrant -================================= - -License -======= - -This work is licensed under a Creative Commons Attribution 4.0 -International License. .. http://creativecommons.org/licenses/by/4.0 .. -(c) Ruijing Guo (Intel) and others - - -Abstract -======== - -This document describes how to build fuel iso based on vagrant. -The build is to follow fuel/docs/build-instruction.rst. - -Note -==== - -Vagrant based build is not official build. The target user is fuel@opnfv -developer. - -How to Build -============ - -run ./build_fuel.sh - - -Vagrantfile -=========== - -you can change memory & cpus to fit your enviorments. - -setup_fuel.sh -============= - -The script is run in VM and follow fuel/docs/build-instruction.rst. diff --git a/build/vagrant/Vagrantfile b/build/vagrant/Vagrantfile deleted file mode 100644 index 0fbadf2ae..000000000 --- a/build/vagrant/Vagrantfile +++ /dev/null @@ -1,23 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -# Vagrantfile API/syntax version. Don't touch unless you know what you're doing! -VAGRANTFILE_API_VERSION = "2" - -Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - - config.vm.box = "trusty-server-cloudimg-amd64" - config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box" - - config.vm.define "fuel" do | h | - h.vm.host_name = "fuel" - h.vm.synced_folder "../..", "/fuel" - h.vm.provider :virtualbox do |v| - v.customize ["modifyvm", :id, "--memory", 8192] - v.customize ["modifyvm", :id, "--cpus", 8] - file_to_disk = 'large_disk.vdi' - v.customize ['createhd', '--filename', file_to_disk, '--size', 512 * 1024] - v.customize ['storageattach', :id, '--storagectl', 'SATAController', '--port', 1, '--device', 0, '--type', 'hdd', '--medium', file_to_disk ] - end - end -end diff --git a/build/vagrant/build_fuel.sh b/build/vagrant/build_fuel.sh deleted file mode 100755 index 051ee4dfd..000000000 --- a/build/vagrant/build_fuel.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -sudo apt-get update -sudo apt-get install -y vagrant virtualbox -vagrant destroy -f; vagrant up -vagrant ssh -c "sudo apt-get update; sudo apt-get install -y linux-generic-lts-vivid" -vagrant reload -vagrant ssh -c "/vagrant/setup_fuel.sh" -vagrant ssh -c "cd fuel/build; make; cp fuel*.iso /vagrant" diff --git a/build/vagrant/setup_fuel.sh b/build/vagrant/setup_fuel.sh deleted file mode 100755 index b4d7651f9..000000000 --- a/build/vagrant/setup_fuel.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -sudo apt-get install -y git git-review make curl p7zip-full - -#install docker by https://docs.docker.com/engine/installation/linux/ubuntulinux/ -#sudo apt-get install linux-image-extra-$(uname -r) -sudo apt-get install -y apt-transport-https ca-certificates -sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D - -cat << EOF | sudo tee /etc/apt/sources.list.d/docker.list -deb https://apt.dockerproject.org/repo ubuntu-trusty main -EOF -sudo apt-get update -sudo apt-get purge lxc-docker -y - -#workaroud for large disk -sudo mkdir /var/lib/docker -yes | sudo mkfs.ext4 /dev/sdb -sudo mount /dev/sdb /var/lib/docker - -sudo apt-cache policy docker-engine -sudo apt-get install -y docker-engine -sudo service docker start -sudo groupadd docker -sudo usermod -aG docker vagrant -cp -r /fuel /home/vagrant |