From c92207bba3e0ab887688d5cb1c41cd893f866e23 Mon Sep 17 00:00:00 2001 From: Roger Luethi Date: Wed, 8 Oct 2014 11:21:35 +0200 Subject: [PATCH] labs: remove Vagrant files This patch removes the files used by Vagrant to use the labs scripts. Vagrant support is currently broken. The most pressing issue is that some OpenStack software needs the VM rebooted after the distro software updates, but doing that with Vagrant would take an extra effort. Same goes for adding snapshots. The presence of Vagrant-specific files confused quite a few people who gained the impression that it is a requirement when it has always been an alternative to osbash. If there is sufficient interest in Vagrant support, we can add it back later. Change-Id: I7edfac1bb7c657d30acda0605a078c39d5fa997a --- labs/Vagrantfile | 110 ---------------------------- labs/config/deploy.vagrant | 8 -- labs/scripts/vagrant/allinone.sh | 1 - labs/scripts/vagrant/compute.sh | 1 - labs/scripts/vagrant/controller.sh | 1 - labs/scripts/vagrant/network.sh | 1 - labs/scripts/vagrant/run_scripts.sh | 43 ----------- 7 files changed, 165 deletions(-) delete mode 100644 labs/Vagrantfile delete mode 100644 labs/config/deploy.vagrant delete mode 120000 labs/scripts/vagrant/allinone.sh delete mode 120000 labs/scripts/vagrant/compute.sh delete mode 120000 labs/scripts/vagrant/controller.sh delete mode 120000 labs/scripts/vagrant/network.sh delete mode 100755 labs/scripts/vagrant/run_scripts.sh diff --git a/labs/Vagrantfile b/labs/Vagrantfile deleted file mode 100644 index bbd2e155..00000000 --- a/labs/Vagrantfile +++ /dev/null @@ -1,110 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -# Vagrantfile -# Author: Trevor Roberts Jr (VMTrooper@gmail.com) -# -# NOTE: Before attempting to use this file, follow the required Vagrant -# deployment steps: -# -# http://docs.vagrantup.com/v2/installation/index.html -# -# This file directs Vagrant on how to deploy the student VMs. -# It is possible to do a single-VM or multi-VM deployment based on -# the entries that are enabled in the "nodes" hash at the start of this file. -# -# By default, only the single VM (allinone) deployment type is enabled. -# For multi-VM, comment out 'allinone' and uncomment 'controller', 'compute', -# and 'network'. -# -# Vagrant uses VirtualBox Guest Additions to modify VM properties -# (hostname, IP, resource allocation) according to VM function. -# -# Vagrant's shell provisioner receives deployment instructions from the -# following files: -# allinone.sh -# controller.sh -# compute.sh -# network.sh -# Removing these files without removing the shell provisioner command will -# cause Vagrant errors. -# -# After determining the deployment type, build this environment by typing this -# command at the prompt: -# -# vagrant up -# -# Verify your VM status by typing this command at the prompt: -# vagrant status -# -# SSH to your VM by typing this command at the prompt: -# vagrant ssh vmname (for example: vagrant ssh compute) -# -# See the remaining OpenStack Training Labs code for more details at GitHub: -# https://github.com/openstack/openstack-manuals/tree/master/doc/training-guides/training-labs -nodes = { - 'allinone' => 51, -# 'controller' => 51, -# 'compute' => 52, -# 'network' => 53, -} - -# 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| - - # Every Vagrant virtual environment requires a box (similar to OVA) to build - # from. The Vagrantfile currently uses Ubuntu 14.04 LTS (aka Trusty - # Thar). Modify the line below and the box_url line to use a different - # distribution - - config.vm.box = "ubuntu/trusty64" - - # The URL from where the 'config.vm.box' box will be fetched if it - # doesn't already exist on the user's system. - config.vm.box_url = "https://vagrantcloud.com/ubuntu/trusty64" - - # Define each VM's settings (ex: hostname, IP address, RAM, vCPU, etc.) - nodes.each do |prefix, fourth_octet| - config.vm.define "#{prefix}" do |box| - box.vm.hostname = "#{prefix}" - # Management network - box.vm.network :private_network, ip: "10.10.10.#{fourth_octet}", :netmask => "255.255.255.0" - # Data network - box.vm.network :private_network, ip: "10.20.20.#{fourth_octet}", :netmask => "255.255.255.0" - # API network - box.vm.network :private_network, ip: "192.168.100.#{fourth_octet}", :netmask => "255.255.255.0" - # Forward port 80 to host port 8080 for only the controller or - # all-in-one deployment for Horizon - if prefix == "controller" or prefix == "allinone" - box.vm.network "forwarded_port", guest: 80, host: 8080 - end - # Run the shell provisioning script file (as root) - box.vm.provision :shell, :path => "scripts/vagrant/#{prefix}.sh" - # Advanced VirtualBox settings - box.vm.provider :virtualbox do |vbox| - # Single node resource allocations; will be more selective for - # multi-node - vbox.customize ["modifyvm", :id, "--memory", 2048] - vbox.customize ["modifyvm", :id, "--cpus", 2] - # Multi-node resource allocation based on the prefix name - if prefix == "controller" - vbox.customize ["modifyvm", :id, "--memory", 1024] - vbox.customize ["modifyvm", :id, "--cpus", 1] - elsif prefix == "compute" - vbox.customize ["modifyvm", :id, "--memory", 2048] - vbox.customize ["modifyvm", :id, "--cpus", 2] - elsif prefix == "network" - vbox.customize ["modifyvm", :id, "--memory", 1024] - vbox.customize ["modifyvm", :id, "--cpus", 1] - end - # nicpromisc flag begins nic count at 1, not 0 - # Setting all NICs to promiscuous mode per Pranav's specification - vbox.customize ["modifyvm", :id, "--nicpromisc2", "allow-all"] - vbox.customize ["modifyvm", :id, "--nicpromisc3", "allow-all"] - vbox.customize ["modifyvm", :id, "--nicpromisc4", "allow-all"] - end - end - end -end diff --git a/labs/config/deploy.vagrant b/labs/config/deploy.vagrant deleted file mode 100644 index 71fedf9f..00000000 --- a/labs/config/deploy.vagrant +++ /dev/null @@ -1,8 +0,0 @@ -# Used by guest scripts - -# Name of VirtualBox shared folder -SHARE_NAME=vagrant - -VM_SHELL_USER=vagrant - -# vim: set ai ts=4 sw=4 et ft=sh: diff --git a/labs/scripts/vagrant/allinone.sh b/labs/scripts/vagrant/allinone.sh deleted file mode 120000 index f531795a..00000000 --- a/labs/scripts/vagrant/allinone.sh +++ /dev/null @@ -1 +0,0 @@ -run_scripts.sh \ No newline at end of file diff --git a/labs/scripts/vagrant/compute.sh b/labs/scripts/vagrant/compute.sh deleted file mode 120000 index f531795a..00000000 --- a/labs/scripts/vagrant/compute.sh +++ /dev/null @@ -1 +0,0 @@ -run_scripts.sh \ No newline at end of file diff --git a/labs/scripts/vagrant/controller.sh b/labs/scripts/vagrant/controller.sh deleted file mode 120000 index f531795a..00000000 --- a/labs/scripts/vagrant/controller.sh +++ /dev/null @@ -1 +0,0 @@ -run_scripts.sh \ No newline at end of file diff --git a/labs/scripts/vagrant/network.sh b/labs/scripts/vagrant/network.sh deleted file mode 120000 index f531795a..00000000 --- a/labs/scripts/vagrant/network.sh +++ /dev/null @@ -1 +0,0 @@ -run_scripts.sh \ No newline at end of file diff --git a/labs/scripts/vagrant/run_scripts.sh b/labs/scripts/vagrant/run_scripts.sh deleted file mode 100755 index 3b79bde8..00000000 --- a/labs/scripts/vagrant/run_scripts.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash -set -o errexit - -# Shell provisioning script is renamed and copied to /tmp before being run as -# root -TOP_DIR=/vagrant -source "$TOP_DIR/config/paths" -source "$LIB_DIR/functions.guest" - -clean_dir "$LOG_DIR" - -exec_logpath "$LOG_DIR/$HOSTNAME.log" - -function vagrant_start_from_config { - local config_file=$1 - local config_path=$CONFIG_DIR/$config_file - - if [ ! -f "$config_path" ]; then - echo >&2 "Config file not found: $config_file" - return 1 - fi - - while read -r field_1 field_2; do - if [[ $field_1 =~ ^# ]]; then - # Skip lines that are commented out - continue - elif [[ "$field_1" = cmd || "$field_1" = osbash ]]; then - # Skip osbash commands and scripts for Vagrant - continue - else - local dir="$(src_dir_code_to_dir "$field_1")" - local scr_path=$dir/$field_2 - echo "$scr_path" - as_root_exec_script "$scr_path" - fi - done < "$config_path" -} - -# The Vagrantfile uses Ubuntu -for config_file in "scripts.ubuntu" "scripts.$HOSTNAME"; do - echo "Config file $config_file" - vagrant_start_from_config "$config_file" -done