Fix Devstack Vagrant VMs to use a later OS

Fixes bug 1798

Change-Id: Ibcd179e082c90e9933d822e190d9968a13e95bf4
Signed-off-by: Dave Tucker <djt@redhat.com>

diff --git a/README.Vagrant b/README.Vagrant
index 365109358fd582cfa3145e9b2d42d86c1fb5f647..bc44a8c1426de44d9a6e823e0d9cce388b4225df 100644 (file)
--- a/README.Vagrant
+++ b/README.Vagrant
@@ -4,9 +4,6 @@ ODL OVSDB Vagrant
 # Installation
 
 You can download an install for your system from [here](http://www.vagrantup.com/downloads.html)
-Vagrant can also be installed using RubyGems
-
-    gem install vagrant
 
 # Usage
 
@@ -14,7 +11,7 @@ Vagrant is a tool for creating development/test environments.
 The environment created for this project is as follows:
 
 1 x DevStack Control/Compute VM
-1 x DevStack Compute VM
+1-3 x DevStack Compute VM
 1 x Mininet VM
 
 It's assumed you already have an OVSDB development environment set up.
@@ -31,7 +28,7 @@ Follow the instructions below for Devstack and Mininet
 
 ## DevStack VMs
 
-There are two DevStack VMs. One combined control/compute node and one dedicated compute node.
+There are two DevStack VMs. One combined control/compute node and a variable number of dedicated compute nodes.
 The following steps are performed when the VM is created or when `vagrant provision` is run.
 
 - Check dependencies are installed
@@ -45,6 +42,10 @@ To start DevStack
     cd devstack
     ./stack.sh
 
+> Note: To start more than one compute node
+>       export DEVSTACK_NUM_COMPUTE_NODES=3
+>       vagrant up
+
 ## Mininet
 
 There is a single VM provided for running mininet.

diff --git a/Vagrantfile b/Vagrantfile
index a49014500462493163d003a489d00db5740089b1..84180669b6b5bc8d64abe3fc18f5e1870a1051c6 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -12,6 +12,13 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       puppet.manifest_file  = "base.pp"
   end
 
+  num_compute_nodes = (ENV['DEVSTACK_NUM_COMPUTE_NODES'] || 1).to_i
+
+  # ip configuration
+  control_ip = "192.168.50.20"
+  compute_ip_base = "192.168.50."
+  compute_ips = num_compute_nodes.times.collect { |n| compute_ip_base + "#{n+21}" }
+
   config.vm.define "mininet" do |mininet|
     mininet.vm.box = "trusty64"
     mininet.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.10_chef-provisionerless.box"
@@ -34,22 +41,22 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     end
   end
 
-  config.vm.define "devstack-control" do |dsctl|
-    dsctl.vm.box = "saucy64"
-    dsctl.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.10_chef-provisionerless.box"
-    dsctl.vm.provider "vmware_fusion" do |v, override|
-      override.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.10_chef-provisionerless.box"
+  config.vm.define "devstack-control" do |control|
+    control.vm.box = "saucy64"
+    control.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04_chef-provisionerless.box"
+    control.vm.provider "vmware_fusion" do |v, override|
+      override.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-14.04_chef-provisionerless.box"
     end
-    dsctl.vm.hostname = "devstack-control"
-    dsctl.vm.network "private_network", ip: "192.168.50.20"
-    dsctl.vm.network "forwarded_port", guest: 8080, host: 8081
-    dsctl.vm.provider :virtualbox do |vb|
+    control.vm.hostname = "devstack-control"
+    control.vm.network "private_network", ip: "#{control_ip}"
+    control.vm.network "forwarded_port", guest: 8080, host: 8081
+    control.vm.provider :virtualbox do |vb|
       vb.memory = 4096
     end
-    dsctl.vm.provider "vmware_fusion" do |vf|
+    control.vm.provider "vmware_fusion" do |vf|
       vf.vmx["memsize"] = "4096"
     end
-    dsctl.vm.provision "puppet" do |puppet|
+    control.vm.provision "puppet" do |puppet|
       puppet.hiera_config_path = "resources/puppet/hiera.yaml"
       puppet.working_directory = "/vagrant/resources/puppet"
       puppet.manifests_path = "resources/puppet/manifests"
@@ -57,26 +64,30 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     end
   end
 
-  config.vm.define "devstack-compute" do |dscom|
-    dscom.vm.box = "saucy64"
-    dscom.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.10_chef-provisionerless.box"
-    dscom.vm.provider "vmware_fusion" do |v, override|
-      override.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.10_chef-provisionerless.box"
-    end
-    dscom.vm.hostname = "devstack-compute"
-    dscom.vm.network "private_network", ip: "192.168.50.21"
-    dscom.vm.provider :virtualbox do |vb|
-      vb.memory = 4096
-    end
-    dscom.vm.provider "vmware_fusion" do |vf|
-      vf.vmx["memsize"] = "4096"
-    end
-    dscom.vm.provision "puppet" do |puppet|
-      puppet.hiera_config_path = "resources/puppet/hiera.yaml"
-      puppet.working_directory = "/vagrant/resources/puppet"
-      puppet.manifests_path = "resources/puppet/manifests"
-      puppet.manifest_file  = "devstack-compute.pp"
+  # Devstack Compute Nodes
+  num_compute_nodes.times do |n|
+    config.vm.define "devstack-compute-#{n+1}" do |compute|
+      compute_ip = compute_ips[n]
+      compute_index = n+1
+      compute.vm.box = "trusty64"
+      compute.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04_chef-provisionerless.box"
+      compute.vm.provider "vmware_fusion" do |v, override|
+        override.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-14.04_chef-provisionerless.box"
+      end
+      compute.vm.hostname = "devstack-compute-#{compute_index}"
+      compute.vm.network "private_network", ip: "#{compute_ip}"
+      compute.vm.provider :virtualbox do |vb|
+        vb.memory = 4096
+      end
+      compute.vm.provider "vmware_fusion" do |vf|
+        vf.vmx["memsize"] = "4096"
+      end
+      compute.vm.provision "puppet" do |puppet|
+        puppet.hiera_config_path = "resources/puppet/hiera.yaml"
+        puppet.working_directory = "/vagrant/resources/puppet"
+        puppet.manifests_path = "resources/puppet/manifests"
+        puppet.manifest_file  = "devstack-compute.pp"
+      end
     end
   end
-
 end

diff --git a/resources/puppet/hieradata/hosts.json b/resources/puppet/hieradata/hosts.json
index 74ef641a48b15983114bb9ede3bf5e30cfe8cb4a..346a0d6b887f34b6506f620380b2da51f0b3c5c3 100644 (file)
--- a/resources/puppet/hieradata/hosts.json
+++ b/resources/puppet/hieradata/hosts.json
@@ -12,9 +12,17 @@
       "name": "devstack-control",
       "ipaddress": "192.168.50.20"
     },
-    "devstack-compute": {
-      "name": "devstack-compute",
+    "devstack-compute-1": {
+      "name": "devstack-compute-1",
       "ipaddress": "192.168.50.21"
+    },
+    "devstack-compute-2": {
+      "name": "devstack-compute-2",
+      "ipaddress": "192.168.50.22"
+    },
+    "devstack-compute-3": {
+      "name": "devstack-compute-3",
+      "ipaddress": "192.168.50.23"
     }
   }
 }

diff --git a/resources/puppet/templates/compute.local.conf.erb b/resources/puppet/templates/compute.local.conf.erb
index 0619f2cfa037f0cebd1bf5b7efd1c32afb6cca6d..693d4169bb1d7bd1f90596037e8f19c5bd9a6a03 100644 (file)
--- a/resources/puppet/templates/compute.local.conf.erb
+++ b/resources/puppet/templates/compute.local.conf.erb
@@ -5,8 +5,8 @@ LOG_COLOR=False
 #OFFLINE=True
 #RECLONE=yes
 
-HOST_IP=<%= @hosts['devstack-compute']['ipaddress'] %>
-HOST_NAME=<%= @hosts['devstack-compute']['name'] %>
+HOST_IP=<%= @hosts[@hostname]['ipaddress'] %>
+HOST_NAME=<%= @hosts[@hostname]['name'] %>
 SERVICE_HOST=<%= @hosts['devstack-control']['name'] %>
 SERVICE_HOST_NAME=<%= @hosts['devstack-control']['name'] %>