Update gbp-ubuntu vagrant definition for private cloud

This updates the vagrant definition for gbp-ubuntu to be
in line with the private cloud designs.

Also add gbp to the system_type mapping.

Change-Id: I9d4da48833958f27c5602f8e5e211d20fa104d51
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jenkins-scripts/system_type.sh b/jenkins-scripts/system_type.sh
index d5f9e9b3c53641252635ea1422d19fc7753926dd..8d5b03b89a2c7cce55b3d1494baf8f462fa035ae 100755 (executable)
--- a/jenkins-scripts/system_type.sh
+++ b/jenkins-scripts/system_type.sh
@@ -18,6 +18,7 @@ for i in "autorelease,autorelease" \
          "builder,builder" \
          "devstack,devstack" \
          "docker,docker" \
+         "gbp-trusty,ubuntu-docker-ovs" \
          "java,controller" \
          "matrix,matrix" \
          "robot,robot" \

diff --git a/vagrant/gbp-ubuntu-docker-ovs-node/Vagrantfile b/vagrant/gbp-ubuntu-docker-ovs-node/Vagrantfile
index 54b001f3f37c30be3195a6ec5e8a468138e54b91..cb6b627931974a163653783e1be6d93487dd0847 100644 (file)
--- a/vagrant/gbp-ubuntu-docker-ovs-node/Vagrantfile
+++ b/vagrant/gbp-ubuntu-docker-ovs-node/Vagrantfile
@@ -5,46 +5,60 @@
 VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  # root off of the rackspace provider dummy box
+  # root off of the openstack provider dummy box
   config.vm.box = "dummy"
-
-  # rackspace systems, even with cloud-init
-  # don't seem to have the cloud int user ${osname} (or similar)
-  # getting the ssh key for some reason, root does for sure
-  # so use that
   config.ssh.username = 'root'
 
-  # Only baseline image should have config.ssh.pty = true
-  # Ensure we disable it.
-  config.ssh.pty = false
-
   # make sure to set the following in your
-  # ~/.vagrant.d/boxes/dummy/0/rackspace/Vagrantfile
-  # rs.username
-  # rs.api_key
-  # rs.rackspace_region
+  # ~/.vagrant.d/boxes/dummy/0/openstack/Vagrantfile
+  #
+  # os.openstack_auth_url
+  # os.endpoint_type
+  # os.flavor
+  # os.tenant_name
+  # os.username
+  # os.password
+  # os.networks
   #
   # If you are not using an SSH token / smartcard also set this
-  # rs.key_name
-  # config.ssh.private_key_path -- set this outside the rackspace block
+  # os.key_name
+  # config.ssh.private_key_path -- set this outside the openstack block
   #         in your base box
-  config.vm.provider :rackspace do |rs|
-    # create these base builds always on the smallest system possible
-    rs.flavor = 'general1-1'
-
-    # allow for switching to ORD cloud but default to DFW
-    if (ENV['RSREGION'] == 'ord')
-      rs.rackspace_region = :ord
+  config.vm.provider :openstack do |os, override|
+    if ENV['BOX']
+      override.vm.box = ENV['BOX']
     else
-      rs.rackspace_region = :dfw
+      override.vm.box = 'dummy'
     end
+    config.ssh.username = 'centos'
+    os.flavor = 'm1.small'
 
-    # Default the Ubuntu 14.04 - Vagrant ready image unless overriden by a RSIMAGE
-    # environment variable
-    if ENV['RSIMAGE']
-      rs.image = ENV['RSIMAGE']
+    # require an IMAGE to be passed in
+    # IMAGE must be a human name and not an image ID!
+    if ENV['IMAGE']
+      os.image = ENV['IMAGE']
     else
-      rs.image = 'Ubuntu 14.04 - Vagrant ready'
+      os.image = 'BAD IMAGE'
+      override.ssh.username = 'baduser'
+    end
+
+    case ENV['IMAGE']
+      when /.*ubuntu.*/i
+        override.ssh.username = 'ubuntu'
+
+      when /.*fedora.*/i
+        override.ssh.username = 'fedora'
+
+        # take care of the tty requirement by fedora for sudo
+        os.user_data = "#!/bin/bash
+/bin/sed -i 's/ requiretty/ !requiretty/' /etc/sudoers;"
+
+      when /.*centos.*/i
+        override.ssh.username = 'centos'
+
+        # take care of the tty requirement by centos for sudo
+        os.user_data = "#!/bin/bash
+/bin/sed -i 's/ requiretty/ !requiretty/' /etc/sudoers;"
     end
   end
 
@@ -52,19 +66,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.synced_folder ".", "/vagrant"
   config.vm.synced_folder "../lib/", "/vagrant/lib"
 
-  # run our bootstrapping for the system
-  config.vm.provision 'shell', path: 'bootstrap.sh'
-
-
-  #################
-  # LF NETWORKING #
-  #################
+  # Do a full system update and enable enforcing if needed
+  config.vm.provision 'shell', path: '../lib/baseline.sh'
 
-  if ENV['LFNETWORK']
-    # reconfigure the network setup to support our special private setup
-    config.vm.provision 'shell', path: '../lib/lf-networking/configure_lf_infra.sh',
-      args: ENV['RSSUBDOMAIN']
-  end
+  # run our bootstrapping
+  config.vm.provision 'shell', path: 'bootstrap.sh'
 
 
   #################

diff --git a/vagrant/gbp-ubuntu-docker-ovs-node/bootstrap.sh b/vagrant/gbp-ubuntu-docker-ovs-node/bootstrap.sh
index e8ac368235ae07070f9569d4a1c9fb9887e90e39..2b880b73ef9f193237bf4495e538ea54ee171b71 100644 (file)
--- a/vagrant/gbp-ubuntu-docker-ovs-node/bootstrap.sh
+++ b/vagrant/gbp-ubuntu-docker-ovs-node/bootstrap.sh
@@ -2,10 +2,9 @@
 
 # vim: sw=4 ts=4 sts=4 et tw=72 :
 
-echo "---> Updating operating system"
-apt-get update -qq
-DEBIAN_FRONTEND=noninteractive apt-get upgrade -y --force-yes -qq \
-    -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold"
+# Ensure that necessary variables are set to enable noninteractive mode in
+# commands.
+export DEBIAN_FRONTEND=noninteractive
 
 # we need garethr-docker in our puppet manifest to install docker
 # cleanly