Lots of fixes:

Tim Pouyer · Tim Pouyer · commit 4ca7fb6c45fc · 2016-06-01T22:24:14.000-04:00
-- hostname and domain now setup correctly -- switched out mysql database for postgre in openstack (faster performance less memory overhead) -- add swapfile to box, allows for continued operation (albiet at a cost to performance) at much lower memory levels, can support min memory of 4096 -- add Docker Heat plugin to the heat engine on openstack -- added Docker Engine to box -- added local passthrough mirror docker registry to box -- added web front-end for mirror registry (available at http://192.168.27.100:4080/home) -- added ibm jre 1.7 in /opt/java and set up system wide JAVA_HOME variable
diff --git a/scripts/docker/config.yml b/scripts/docker/config.yml
@@ -0,0 +1,22 @@
+version: 0.1
+log:
+  fields:
+    service: registry
+storage:
+  cache:
+    blobdescriptor: inmemory
+  filesystem:
+    rootdirectory: /var/lib/registry
+  delete:
+    enabled: true
+http:
+  addr: :5000
+  headers:
+    X-Content-Type-Options: [nosniff]
+proxy:
+  remoteurl: https://registry-1.docker.io
+health:
+  storagedriver:
+    enabled: true
+    interval: 60s
+    threshold: 5
diff --git a/scripts/docker/heat.sh b/scripts/docker/heat.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+cd /tmp
+git clone -b stable/liberty https://github.com/openstack/heat.git
+cd heat/contrib/heat_docker/
+sudo pip install -r requirements.txt
+sudo mkdir -p /var/lib/heat
+sudo cp -r heat_docker/ /var/lib/heat
+sudo chown -R vagrant:vagrant /var/lib/heat
+sudo sed -i 's|rpc_backend = rabbit|rpc_backend = rabbit \
+plugin_dirs = /var/lib/heat|g' /etc/heat/heat.conf
+sudo chown -R vagrant:vagrant /var/lib/heat
+
+/vagrant/scripts/minimize/clean.sh
+
diff --git a/scripts/docker/init.sh b/scripts/docker/init.sh
@@ -1,10 +1,24 @@
 #!/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"
+curl -s 'https://sks-keyservers.net/pks/lookup?op=get&search=0xee6d536cf7dc86e2d7d56f59a178ac6c6238f52e' | sudo apt-key add --import
+sudo apt-get update && sudo apt-get install -qqy apt-transport-https
+sudo apt-get install -qqy linux-image-extra-virtual
+echo "deb https://packages.docker.com/1.11/apt/repo ubuntu-trusty main" | sudo tee /etc/apt/sources.list.d/docker.list
+sudo apt-get update && sudo apt-get install -qqy docker-engine
+sudo usermod -a -G docker vagrant
 
-sudo apt-get -qqy update
-sudo apt-get install -qqy docker-engine
+sudo mkdir -p /var/lib/registry
+sudo mkdir -p /etc/docker/registry
+sudo cp /vagrant/scripts/docker/config.yml /etc/docker/registry/config.yml
 
-sudo usermod -aG docker vagrant
-newgrp docker
+sudo chown -R :docker /var/lib/registry/
+sudo chown -R :docker /etc/docker/registry/
+
+# 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
diff --git a/scripts/docker/mirror.sh b/scripts/docker/mirror.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+cat >> /etc/default/docker <<EOF
+DOCKER_OPTS="-H tcp://192.168.27.100:2375 -H unix:///var/run/docker.sock -D --dns 8.8.8.8 --dns 8.8.4.4 --userland-proxy=false --registry-mirror=http://192.168.27.100:4000 --insecure-registry=192.168.27.100:4000 --disable-legacy-registry"
+EOF
+service docker restart
diff --git a/scripts/minimize/clean.sh b/scripts/minimize/clean.sh
@@ -54,6 +54,8 @@ sudo apt-get -qqy autoremove
 sudo apt-get -qqy autoclean
 sudo apt-get -qqy clean
 
+sudo rm -rf /var/lib/apt/lists/*
+
 # delete python library cache
 sudo rm -rf /var/cache/pip/*
 
diff --git a/scripts/stackinabox/init.sh b/scripts/stackinabox/init.sh
@@ -49,12 +49,14 @@ sudo update-alternatives --install /bin/sh sh /bin/bash 100
 
 # We need swap space to do any sort of scale testing with the Vagrant config.
 # Without this, we quickly run out of RAM and the kernel starts whacking things.
-sudo rm -f /swapfile1
-sudo dd if=/dev/zero of=/swapfile1 bs=1024 count=8388608
-sudo chown root:root /swapfile1
-sudo chmod 0600 /swapfile1
-sudo mkswap /swapfile1
-sudo swapon /swapfile1
+sudo rm -f /swapfile
+sudo fallocate -l 4G /swapfile
+sudo chmod 600 /swapfile
+sudo mkswap /swapfile
+sudo swapon /swapfile
+sudo echo "vm.swappiness = 10" | sudo tee --append /etc/sysctl.conf > /dev/null
+sudo echo "vm.vfs_cache_pressure = 50" | sudo tee --append /etc/sysctl.conf > /dev/null
+sudo echo "/swapfile   none    swap    sw    0   0" | sudo tee --append /etc/fstab > /dev/null
 
 # Disable firewall (this is not production)
 sudo ufw disable
@@ -73,14 +75,15 @@ sudo sysctl -p
 sudo iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE
 
 # Update host configuration
-sudo bash -c "echo 'openstack.stackinabox.io' > /etc/hostname"
+sudo bash -c "echo 'openstack' > /etc/hostname"
 #export eth1=`ifconfig eth1 | sed -En 's/127.0.0.1//;s/.*inet (addr:)?(([0-9]*\.){3}[0-9]*).*/\2/p'`
 sudo bash -c 'cat > /etc/hosts' <<EOF
-127.0.0.1         localhost.localdomain     localhost openstack.stackinabox.io openstack
-192.168.27.100    openstack.stackinabox.io  openstack
-
+127.0.0.1         localhost
+192.168.27.100    openstack.stackinabox.io openstack
 EOF
 
+sudo hostname openstack
+
 # speed up DNS resolution
 sudo bash -c 'cat > /etc/dhcp/dhclient.conf' <<EOF
 timeout 30;
@@ -92,24 +95,21 @@ backoff-cutoff 2;
 link-timeout 10;
 interface "eth0"
 {
-  supersede host-name "openstack.stackinabox.io";
-  supersede domain-name "stackinabox.io";
+  #supersede host-name "openstack";
+  #supersede domain-name "stackinabox.io";
   prepend domain-name-servers 192.168.27.1, 8.8.8.8, 8.8.4.4;
-  request subnet-mask,
-          broadcast-address,
+  request subnet-mask, 
+          broadcast-address, 
+          time-offset, 
           routers,
-          domain-name,
-          domain-name-servers,
-          host-name;
-  require routers,
-          subnet-mask,
-          domain-name-servers;
+          domain-name, 
+          domain-name-servers, 
+          host-name,
+          netbios-name-servers, 
+          netbios-scope;
 }
 EOF
 
-# Restart networking
-sudo /etc/init.d/networking restart
-
 # enable cgroup memory limits
 sudo sed -i 's/GRUB_CMDLINE_LINUX_DEFAULT="/GRUB_CMDLINE_LINUX_DEFAULT="cgroup_enable=memory swapaccount=1 /g' /etc/default/grub
 sudo sed -i 's/GRUB_CMDLINE_LINUX="/GRUB_CMDLINE_LINUX="cgroup_enable=memory swapaccount=1 /g' /etc/default/grub
@@ -163,16 +163,8 @@ iface br-ex inet static
 EOF
 
 # Install NTP
-sudo apt-get install -y ntp
-
-# stop ntp service so we can set the pool to use
-sudo service ntp stop
-
-# Set ntp.ubuntu.com as the direct source of time.
-sudo ntpdate us.pool.ntp.org
-
-# restart the NTP service
-sudo service ntp restart
+# disabling b/c slow seed times at system startup are causing problems
+#sudo apt-get install -qqy ntp
 
 # 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
@@ -230,27 +222,33 @@ sudo chmod +x /etc/init.d/devstack
 sudo update-rc.d devstack start 98 2 3 4 5 . stop 02 0 1 6 .
 
 # install 'shellinabox' to make using this image on windows easier
-# shellinabox will be available at http://192.168.27.100:4200
-# sudo apt-get install -y shellinabox
-# sudo sed -i 's/--no-beep/--no-beep --disable-ssl/g' /etc/default/shellinabox
-# sudo /etc/init.d/shellinabox restart
-
-# wait for openstack to startup
-sleep 60
-
-# clean up after ourselves
-/vagrant/scripts/minimize/clean.sh 
+#shellinabox will be available at http://192.168.27.100:4200
+sudo apt-get install -y shellinabox
+sudo sed -i 's/--no-beep/--no-beep --disable-ssl/g' /etc/default/shellinabox
+sudo /etc/init.d/shellinabox restart
 
 # install java (for use with udclient)
-sudo apt-get update
-sudo apt-get install -qqy default-jre
+wget http://artifacts.stackinabox.io/ibm/java-jre/latest.txt
+ARTIFACT_VERSION=$(cat latest.txt)
+ARTIFACT_DOWNLOAD_URL=http://artifacts.stackinabox.io/ibm/java-jre/$ARTIFACT_VERSION/ibm-java-jre-$ARTIFACT_VERSION-linux-x86_64.tgz
+
+sudo mkdir -p /opt/java
+sudo wget $ARTIFACT_DOWNLOAD_URL
+sudo tar -zxf ibm-java-jre-$ARTIFACT_VERSION-linux-x86_64.tgz -C /opt/java/
 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
+export JAVA_HOME=/opt/java/ibm-java-x86_64-71/jre
+export PATH=$JAVA_HOME/bin:$PATH
 EOF
 sudo chmod 755 /etc/profile.d/java_home.sh
 
 sudo btrfs quota enable /var/lib/lxd
 
+# wait for openstack to startup
+sleep 60
+
+# clean up after ourselves
+/vagrant/scripts/minimize/clean.sh 
+
 # restart
 #sudo shutdown -P now
diff --git a/scripts/stackinabox/local.conf b/scripts/stackinabox/local.conf
@@ -44,8 +44,10 @@ GIT_BASE=https://github.com
 DEVSTACK_INSTALL_DIR=/opt/stack/devstack
 
 # Database Type
-DATABASE_TYPE=mysql
-enable_service mysql
+#DATABASE_TYPE=mysql
+#enable_service mysql
+DATABASE_TYPE=postgres
+enable_service postgres
 
 # RPC Backend
 enable_service rabbit
@@ -79,6 +81,7 @@ DATABASE_USER=root
 DATABASE_PASSWORD=labstack
 ADMIN_PASSWORD=labstack
 MYSQL_PASSWORD=labstack
+POSTGRES_PASSWORD=labstack
 RABBIT_PASSWORD=labstack
 SERVICE_PASSWORD=labstack
 SERVICE_TOKEN=labstack
@@ -89,6 +92,7 @@ SERVICE_TOKEN=labstack
 enable_service key
 KEYSTONE_TOKEN_FORMAT=UUID
 KEYSTONE_CATALOG_BACKEND=sql
+#ENABLE_IDENTITY_V2=False
 
 #
 # Enable Nova
@@ -175,13 +179,12 @@ enable_service horizon
 #
 disable_service tempest
 
-#enable_plugin designate https://github.com/openstack/designate
-#DESIGNATE_BRANCH=master
+#enable_plugin designate https://git.openstack.org/openstack/designate
 
-enable_plugin kuryr http://git.openstack.org/openstack/kuryr
-enable_service kuryr
-enable_service etcd-server
-enable_service docker-engine
+#enable_plugin kuryr http://git.openstack.org/openstack/kuryr
+#enable_service kuryr
+#enable_service etcd-server
+#enable_service docker-engine
 
 #
 # set current branch
diff --git a/scripts/stackinabox/stack-noscreenrc b/scripts/stackinabox/stack-noscreenrc
@@ -6,9 +6,9 @@
 
 #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 ./scripts/run_kuryr.sh >> /opt/stack/logs/kuryr.log 2>&1 &
 
-sudo service docker restart >> /opt/stack/logs/docker-restart.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 &
 
diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile
@@ -37,7 +37,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   end
 
   if Vagrant.has_plugin?("vagrant-vbguest")
-    config.vbguest.auto_update = false
+    config.vbguest.auto_update = true
   end
 
   #if !Vagrant.has_plugin?("vagrant-reload")
@@ -68,6 +68,33 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     # eth2, this will be OpenStack's "public" network configured on vm by stackinabox.sh script and bridged to OpenvSwitch on VM
     stackinabox.vm.network "private_network", ip: "172.24.4.225", adapter_ip: "172.24.4.225", netmask: "255.255.255.0", auto_config: false
 
+    # install docker
+    stackinabox.vm.provision "shell", name: "install-docker", path: File.expand_path(File.join(vagrant_dir, "..", "scripts",  "docker", "init.sh"), __FILE__)
+
+    # run docker registry mirror
+    stackinabox.vm.provision "setup_registry", type: "docker" do |d|
+
+        d.run "registry",
+          image: "registry:2.4.1",
+          daemonize: true,
+          restart: "always",
+          args: "-e SEARCH_BACKEND=sqlalchemy -p 4000:5000 -v /var/lib/registry:/var/lib/registry -v /etc/docker/registry/config.yml:/etc/docker/registry/config.yml" 
+
+    end
+
+    # configure docker to use local registry mirror
+    stackinabox.vm.provision "shell", name: "enable-docker-registry-cache", path: File.expand_path(File.join(vagrant_dir, "..", "scripts",  "docker", "mirror.sh"), __FILE__)
+
+    stackinabox.vm.provision "setup_registry_ui", type: "docker" do |d|
+
+        d.run "registry-frontend",
+          image: "konradkleine/docker-registry-frontend:v2",
+          daemonize: true,
+          restart: "always",
+          args: "-p 4080:80 -e ENV_DOCKER_REGISTRY_HOST=192.168.27.100 -e ENV_DOCKER_REGISTRY_PORT=4000 -e ENV_MODE_BROWSE_ONLY=true -e ENV_DEFAULT_REPOSITORIES_PER_PAGE=50"
+
+    end
+
     # Provider-specific configuration
     stackinabox.vm.provider "virtualbox" do |vb|
       # Don't boot with headless mode
@@ -120,8 +147,6 @@ 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"
 
-    # 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__)
-
+    stackinabox.vm.provision :shell, name: "add_docker_heat_plugin", privileged: false, keep_color: false, path: File.expand_path(File.join(vagrant_dir, "..", "scripts", "docker", "heat.sh"), __FILE__)
   end
 end
