Updated to add Docker runtime to image (to be used by downstream consumers)

Author: Tim Pouyer

scripts/docker/.gitignore

@@ -0,0 +1,3 @@
+# Vagrant
+.DS_Store
+registry/

scripts/docker/init.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+sudo apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
+sudo bash -c "echo 'deb https://apt.dockerproject.org/repo ubuntu-trusty main' > /etc/apt/sources.list.d/docker.list"
+
+sudo apt-get -qqy update
+sudo apt-get install -qqy docker-engine
+
+sudo usermod -aG docker vagrant
+newgrp docker

scripts/stackinabox/local.conf

@@ -95,6 +95,7 @@ LOGDAYS=1
 VERBOSE=True
 LOG_COLOR=True
 LOGFILE=$DEST/logs/stack.sh.log
+USE_SCREEN=True
 SCREEN_LOGDIR=$DEST/logs
 ENABLE_DEBUG_LOG_LEVEL=True
 

scripts/stackinabox/openrc

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+if [[ -n "$1" ]]; then
+    OS_USERNAME=$1
+fi
+if [[ -n "$2" ]]; then
+    OS_TENANT_NAME=$2
+fi
+
+export OS_USERNAME=${OS_USERNAME:-demo}
+export OS_TENANT_NAME=${OS_TENANT_NAME:-demo}
+export OS_PASSWORD=labstack
+export OS_NO_CACHE=1
+export OS_REGION_NAME=${REGION_NAME:-labstack}
+export HOST_IP=${HOST_IP:-192.168.27.100}
+export SERVICE_HOST=${SERVICE_HOST:-$HOST_IP}
+export GLANCE_HOST=${GLANCE_HOST:-$HOST_IP}
+export SERVICE_PROTOCOL=${SERVICE_PROTOCOL:-http}
+export KEYSTONE_AUTH_PROTOCOL=${KEYSTONE_AUTH_PROTOCOL:-$SERVICE_PROTOCOL}
+export KEYSTONE_AUTH_HOST=${KEYSTONE_AUTH_HOST:-$SERVICE_HOST}
+export OS_IDENTITY_API_VERSION=${IDENTITY_API_VERSION:-2.0}
+export OS_AUTH_URL=$KEYSTONE_AUTH_PROTOCOL://$KEYSTONE_AUTH_HOST:5000/v${OS_IDENTITY_API_VERSION}
+
+export BARBICAN_ENDPOINT=$SERVICE_PROTOCOL://$SERVICE_HOST:9311

vagrant/Vagrantfile

@@ -42,7 +42,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   end
 
   if Vagrant.has_plugin?("vagrant-vbguest")
-    config.vbguest.auto_update = true
+    config.vbguest.auto_update = false
   end
 
   #if !Vagrant.has_plugin?("vagrant-reload")
@@ -61,7 +61,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     stackinabox.vm.box_url = $box_url
     stackinabox.vm.box_download_insecure = true
 
-    stackinabox.vm.hostname = "stackinabox"
+    stackinabox.vm.hostname = "openstack.stackinabox.io"
 
     # eth0, this is the vbox "management" network (10.0.2.x), auto created/configured by vagrant, uses NAT
     # not defined here b/c vbox creates this network behind the scenes
@@ -123,12 +123,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
     stackinabox.vm.provision "file", source: File.expand_path(File.join(vagrant_dir, "..", "scripts", "stackinabox", "openrc"), __FILE__), destination: "/home/vagrant/openrc"
 
-    #stackinabox.vm.provision :reload
-    
-    #stackinabox.vm.provision :shell, name: "operations", privileged: true, keep_color: false, path: File.expand_path(File.join(vagrant_dir, "..", "scripts",  "operations", "init.sh"), __FILE__)
-      
-    #stackinabox.vm.provision :shell, name: "chef", privileged: true, keep_color: false, path: File.expand_path(File.join(vagrant_dir, "..", "scripts",  "chef", "init.sh"), __FILE__)
+    # install docker
+    stackinabox.vm.provision "shell", name: "install_docker", privileged: false, keep_color: false, path: File.expand_path(File.join(vagrant_dir, "..", "scripts", "docker", "init.sh"), __FILE__)
 
-    
   end
 end