Adding a few updates before demo

Author: Tim Pouyer

scripts/stackinabox/init.sh

@@ -176,8 +176,8 @@ sudo service ntp restart
 
 # Configure MTU on VM interfaces. Also requires manually configuring the same MTU on
 # the equivalent 'vboxnet' interfaces on the host. i.e. sudo ip link set dev vboxnet0 mtu $MTU
-# sudo ip link set dev eth1 mtu $MTU
-# sudo ip link set dev eth2 mtu $MTU
+sudo ip link set dev eth1 mtu $MTU
+sudo ip link set dev eth2 mtu $MTU
 
 # Restart networking
 sudo /etc/init.d/networking restart
@@ -238,10 +238,16 @@ sudo update-rc.d devstack start 98 2 3 4 5 . stop 02 0 1 6 .
 # wait for openstack to startup
 sleep 60
 
-# clean up after ourselves
-/vagrant/scripts/minimize/clean.sh
+# install java (for use with udclient)
+sudo apt-get install -qqy default-jre
+sudo touch /etc/profile.d/java_home.sh
+sudo bash -c 'cat >> /etc/profile.d/java_home.sh' <<'EOF'
+export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64/jre
+EOF
+sudo chmod 755 /etc/profile.d/java_home.sh
 
-sudo rm -rf /var/lib/apt/lists/*
+# clean up after ourselves
+/vagrant/scripts/minimize/clean.sh 
 
 sudo btrfs quota enable /var/lib/lxd
 

scripts/stackinabox/openrc

@@ -11,14 +11,12 @@ 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 OS_REGION_NAME=${REGION_NAME:-RegionOne}
 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
+export OS_AUTH_URL=$KEYSTONE_AUTH_PROTOCOL://$KEYSTONE_AUTH_HOST:5000/v${OS_IDENTITY_API_VERSION}

scripts/stackinabox/stack-noscreenrc

@@ -1,10 +1,14 @@
 #!/bin/bash
 
-/opt/stack/etcd/etcd-v2.2.2-linux-amd64/etcd --data-dir /opt/stack/etcd/db.etcd --advertise-client-urls http://0.0.0.0:4001  --listen-client-urls http://0.0.0.0:4001 >> /opt/stack/logs/etcd-server.log 2>&1 &
+#/opt/stack/etcd/etcd-v2.2.2-linux-amd64/etcd --data-dir /opt/stack/etcd/db.etcd --advertise-client-urls http://0.0.0.0:4001  --listen-client-urls http://0.0.0.0:4001 >> /opt/stack/logs/etcd-server.log 2>&1 &
 
-sudo /usr/bin/docker daemon -H tcp://0.0.0.0:2375 --cluster-store etcd://localhost:4001 >> /opt/stack/logs/docker-engine.log 2>&1 &
+#sudo /usr/bin/docker daemon -H tcp://0.0.0.0:2375 --cluster-store etcd://localhost:4001 >> /opt/stack/logs/docker-engine.log 2>&1 &
 
-sudo PYTHONPATH=:/opt/stack/kuryr SERVICE_USER=admin SERVICE_PASSWORD=labstack SERVICE_TENANT_NAME=admin SERVICE_TOKEN=labstack IDENTIY_URL=http://127.0.0.1:5000/v2.0 python /opt/stack/kuryr/scripts/run_server.py  --config-file /etc/kuryr/kuryr.conf >> /opt/stack/logs/ >> /opt/stack/logs/kuryr.log 2>&1 &
+#sudo PYTHONPATH=:/opt/stack/kuryr SERVICE_USER=admin SERVICE_PASSWORD=labstack SERVICE_TENANT_NAME=admin SERVICE_TOKEN=labstack IDENTIY_URL=http://127.0.0.1:5000/v2.0 python /opt/stack/kuryr/scripts/run_server.py  --config-file /etc/kuryr/kuryr.conf >> /opt/stack/logs/kuryr.log 2>&1 &
+
+sudo ./scripts/run_kuryr.sh >> /opt/stack/logs/kuryr.log 2>&1 &
+
+sudo service docker restart >> /opt/stack/logs/docker-restart.log 2>&1 &
 
 /usr/local/bin/glance-registry --config-file=/etc/glance/glance-registry.conf >> /opt/stack/logs/g-reg.log 2>&1 &
 

vagrant/Personalization.dist

@@ -1,6 +1,10 @@
 # Use NFS? (won't work on windows)
 $use_nfs = false
 
+# Configure MTU on VM interfaces. Also requires manually configuring the same MTU on
+# the equivalent 'vboxnet' interfaces on the host. i.e. sudo ip link set dev vboxnet0 mtu $MTU
+$mtu = 1500
+
 # Box name
 $box = "ubuntu/trusty64"
 

vagrant/Vagrantfile

@@ -47,6 +47,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.define "stackinabox" do |stackinabox|
 
     config.vm.synced_folder File.expand_path(File.join(vagrant_dir, ".."), __FILE__), "/vagrant"#, :nfs => $use_nfs
+    #config.vm.synced_folder File.expand_path(File.join(vagrant_dir, "..", "scripts", "docker", "runtime"), __FILE__), "/var/lib/docker", create: true
 
     config.ssh.forward_agent = true
     config.ssh.insert_key = false
@@ -79,7 +80,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       vb.customize ["modifyvm", :id, "--cpus", "#{$cpus}"] # set number of vcpus
       vb.customize ["modifyvm", :id, "--memory", "#{$memory}"] # set amount of memory allocated vm memory
       vb.customize ["modifyvm", :id, "--ostype", "Ubuntu_64"] # set guest OS type
-      #vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"] # enables DNS resolution from guest using host's DNS
+      vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"] # enables DNS resolution from guest using host's DNS
       #vb.customize ["modifyvm", :id, "--nicpromisc2", "allow-all"] # turn on promiscuous mode on nic 2
       vb.customize ["modifyvm", :id, "--nicpromisc3", "allow-all"] # turn on promiscuous mode on nic 3
       vb.customize ["modifyvm", :id, "--nictype1", "virtio"]