Fix data disk size issue

Tim Pouyer · Tim Pouyer · commit 0973d4727825 · 2016-08-17T05:47:25.000-04:00
Add support for running Docker within LXD Containers
Update virtualbox guest images to latest version
Add Docker Heat plugins to heat server
diff --git a/.gitignore b/.gitignore
@@ -3,5 +3,5 @@
 .idea
 stackinabox.iml
 demo_key.priv
-build/
+builds/
 images/
diff --git a/lxc-cloud-images/.gitignore b/lxc-cloud-images/.gitignore
@@ -0,0 +1,4 @@
+# Vagrant
+.DS_Store
+*.xz
+*.xz.*
diff --git a/lxc-cloud-images/import-images.sh b/lxc-cloud-images/import-images.sh
@@ -0,0 +1,37 @@
+
+echo "downloading trusty-server-cloudimg-amd64-root.tar.xz image archive for import"
+wget -nv https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-root.tar.xz
+glance image-create --name 'ubuntu-1404-server-cloudimg-amd64' \
+	--container-format bare \
+	--disk-format raw \
+	--visibility public \
+	--min-disk 1 \
+	--property architecture=x86_64 \
+	--property hypervisor_type=lxc \
+	--property os_distro=ubuntu \
+	--property os_version=14.04 \
+	--property vm_mode=exe < trusty-server-cloudimg-amd64-root.tar.xz
+
+echo "downloading xenial-server-cloudimg-amd64-root.tar.xz image archive for import"
+wget -nv https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-root.tar.xz
+glance image-create --name 'ubuntu-1604-server-cloudimg-amd64' \
+	--container-format bare \
+	--disk-format raw \
+	--visibility public \
+	--min-disk 1 \
+	--property architecture=x86_64 \
+	--property hypervisor_type=lxc \
+	--property os_distro=ubuntu \
+	--property os_version=16.04 \
+	--property vm_mode=exe < xenial-server-cloudimg-amd64-root.tar.xz
+
+# glance image-create --name 'centos-6-amd64' \
+# 	--container-format bare \
+# 	--disk-format raw \
+# 	--visibility public \
+# 	--min-disk 1 \
+# 	--property architecture=x86_64 \
+# 	--property hypervisor_type=lxc \
+# 	--property os_distro=centos \
+# 	--property os_version=6 \
+# 	--property vm_mode=exe < centos-6-amd64-root.tar.gz
diff --git a/scripts/docker/heat.sh b/scripts/docker/heat.sh
@@ -1,7 +1,10 @@
 #!/bin/bash
 
+# set release branch to retrieve from git
+RELEASE_BRANCH=${1:-master}
+
 cd /tmp
-git clone -b stable/liberty https://github.com/openstack/heat.git
+git clone -b $RELEASE_BRANCH https://github.com/openstack/heat.git
 cd heat/contrib/heat_docker/
 sudo pip install -r requirements.txt
 sudo mkdir -p /var/lib/heat
@@ -11,5 +14,9 @@ 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
-
+source /home/vagrant/admin-openrc.sh labstack
+nova flavor-key m1.tiny set lxd_docker_allowed=true
+nova flavor-key m1.small set lxd_docker_allowed=true
+nova flavor-key m1.medium set lxd_docker_allowed=true
+nova flavor-key m1.large set lxd_docker_allowed=true
+nova flavor-key m1.xlarge set lxd_docker_allowed=true
diff --git a/scripts/lxd/.gitignore b/scripts/lxd/.gitignore
diff --git a/scripts/stackinabox/devstack b/scripts/stackinabox/devstack
@@ -11,13 +11,17 @@
 start() {
 
   # allow OpenStack nodes to route packets out to NATed network on HOST
-  iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE
+  iptables -t nat -A POSTROUTING -o enp0s3 -j MASQUERADE
+
+  # set floating ip network (external network) to mtu of 1450
+  ip link set dev enp0s9 mtu 1450
 
   # attach stack-volumes
-  losetup /dev/loop0 /opt/stack/data/stack-volumes-lvmdriver-1-backing-file
+  losetup /dev/loop0 /opt/stack/data/stack-volumes-default-backing-file
+  losetup /dev/loop1 /opt/stack/data/stack-volumes-lvmdriver-1-backing-file
 
   echo 'Starting DevStack' >&2
-  su -c "screen -dm -c /opt/stack/devstack/stack-screenrc" -s /bin/sh vagrant
+  su -c "/opt/stack/devstack/stack-noscreenrc" -s /bin/sh vagrant
   echo 'DevStack started' >&2
 }
 
diff --git a/scripts/stackinabox/devstack2 b/scripts/stackinabox/devstack2
diff --git a/scripts/stackinabox/init.sh b/scripts/stackinabox/init.sh
@@ -23,8 +23,15 @@ echo Updating...
 sudo apt-get -y update
 sudo apt-get install -y zfsutils-linux git
 
-echo Creating ZFS for lxd
-sudo zpool create -m /lxd -f lxd sdb
+echo "Creating ZFS for lxd"
+sudo zpool create -m /var/lib/lxd -f lxd sdb
+sudo zpool set feature@lz4_compress=enabled lxd
+sudo zfs set compression=lz4 lxd
+sudo touch /etc/init/zpool-import.conf
+sudo sed -i 's/modprobe zfs zfs_autoimport_disable=1/modprobe zfs zfs_autoimport_disable=0/g' /etc/init/zpool-import.conf
+sudo sed -i 's/# By default this script does nothing./zfs mount -a/g' /etc/rc.local
+
+echo "Install LXD and initialize with ZFS storage-pool 'lxd' for backend"
 sudo apt-get install -y lxd
 sudo lxd init --auto --storage-backend zfs --storage-pool lxd
 
@@ -83,7 +90,7 @@ initial-interval 1;
 backoff-cutoff 2;
 interface "enp0s3"
 {
-  prepend domain-name-servers 192.168.27.1, 8.8.8.8, 8.8.4.4;
+  prepend domain-name-servers 192.168.27.100, 8.8.8.8, 8.8.4.4;
   request subnet-mask,
           broadcast-address,
           time-offset,
@@ -108,7 +115,7 @@ sudo chown -R vagrant:vagrant /opt/stack
 git clone https://git.openstack.org/openstack-dev/devstack.git /opt/stack/devstack -b "${RELEASE_BRANCH}"
 #need to do below to stop devstack failing on test-requirements for lxd
 echo "Cloning nova-lxd repo from branch \"${RELEASE_BRANCH}\""
-git clone https://github.com/openstack/nova-lxd /opt/stack/nova-lxd -b "${RELEASE_BRANCH}"
+git clone https://github.com/stackinabox/nova-lxd /opt/stack/nova-lxd -b "${RELEASE_BRANCH}"
 rm -f /opt/stack/nova-lxd/test-requirements.txt
 # add local.conf to /opt/devstack folder
 cp /vagrant/scripts/stackinabox/local.conf /opt/stack/devstack/
@@ -121,6 +128,7 @@ sed -i "s@RELEASE_BRANCH=@RELEASE_BRANCH=$RELEASE_BRANCH@" /opt/stack/devstack/l
 sudo ifconfig enp0s9 0.0.0.0
 sudo ifconfig enp0s9 promisc
 sudo ip link set dev enp0s9 up
+sudo ip link set dev enp0s9 mtu 1450
 # gentelmen start your engines
 echo "Installing DevStack"
 cd /opt/stack/devstack
@@ -142,6 +150,7 @@ sudo bash -c 'cat >> /etc/network/interfaces' <<'EOF'
 auto enp0s9
 iface enp0s9 inet manual
     address 0.0.0.0
+    mtu 1450
     up ifconfig $IFACE 0.0.0.0 up
     up ip link set $IFACE promisc on
     down ip link set $IFACE promisc off
@@ -160,7 +169,7 @@ sudo ip link set dev enp0s8 mtu $MTU
 
 cp /vagrant/scripts/stackinabox/stack-noscreenrc /opt/stack/devstack/stack-noscreenrc
 chmod 755 /opt/stack/devstack/stack-noscreenrc
-sudo cp /vagrant/scripts/stackinabox/devstack2 /etc/init.d/devstack
+sudo cp /vagrant/scripts/stackinabox/devstack /etc/init.d/devstack
 sudo chmod +x /etc/init.d/devstack
 sudo update-rc.d devstack start 98 2 3 4 5 . stop 02 0 1 6 .
 
diff --git a/scripts/stackinabox/local.conf b/scripts/stackinabox/local.conf
@@ -17,7 +17,6 @@ FORCE=yes
 RECLONE=False
 OFFLINE=False
 ERROR_ON_CLONE=False
-#REGION_NAME=labstack
 
 #
 # set current branch
@@ -27,7 +26,7 @@ RELEASE_BRANCH=
 #
 # Allow services to be hosted on additional machines
 #
-MULTI_HOST=False
+MULTI_HOST=True
 
 #
 # Set OS User DevStack run's under
@@ -37,14 +36,12 @@ STACK_USER=vagrant
 #
 # Use LXD Virtualization Driver
 #
-enable_plugin nova-lxd https://github.com/openstack/nova-lxd "stable/mitaka"
+enable_plugin nova-lxd https://github.com/stackinabox/nova-lxd.git $RELEASE_BRANCH
 
 GIT_BASE=https://github.com
 DEVSTACK_INSTALL_DIR=/opt/stack/devstack
 
 # Database Type
-#DATABASE_TYPE=mysql
-#enable_service mysql
 DATABASE_TYPE=postgres
 enable_service postgres
 
@@ -58,7 +55,7 @@ DEST=/opt/stack
 LOGDAYS=1
 VERBOSE=True
 LOG_COLOR=True
-LOGFILE=$DEST/logs/stack.sh.log
+LOGFILE=$DEST/logs/stack.log
 USE_SCREEN=False
 SCREEN_LOGDIR=$DEST/logs
 ENABLE_DEBUG_LOG_LEVEL=True
@@ -150,8 +147,8 @@ enable_service c-bak
 CINDER_SECURE_DELETE=False
 VOLUME_BACKING_FILE_SIZE=50000M
 
-LIVE_MIGRATION_AVAILABLE=False
-USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION=False
+LIVE_MIGRATION_AVAILABLE=True
+USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION=True
 
 #
 # Enable Glance - OpenStack Image Service
@@ -181,7 +178,6 @@ disable_service tempest
 #
 # set current branch
 #
-CEILOMETER_BRANCH=$RELEASE_BRANCH
 CINDER_BRANCH=$RELEASE_BRANCH
 GLANCE_BRANCH=$RELEASE_BRANCH
 HEAT_BRANCH=$RELEASE_BRANCH
@@ -209,17 +205,19 @@ metadata_host=$HOST_IP
 notification_driver=nova.openstack.common.notifier.rpc_notifier,messagingv2
 notification_topics=notifications,trackinstance
 
-[[post-config|$NEUTRON_CONF]]
-[database]
-min_pool_size = 5
-max_pool_size = 50
-max_overflow = 50
-
 [[post-config|$NEUTRON_CONF]]
 [DEFAULT]
+advertise_mtu=true
+global_physnet_mtu=1550
+dns_domain=stackinabox.io
 notification_driver=neutron.openstack.common.notifier.rpc_notifier,messagingv2
 notification_topics=notifications,trackinstance
 
+[database]
+min_pool_size=10
+max_pool_size=50
+max_overflow=50
+
 
 [[post-config|$CINDER_CONF]]
 [DEFAULT]
@@ -230,3 +228,6 @@ notification_topics=notifications,trackinstance
 [agent]
 tunnel_types=vxlan
 vxlan_udp_port=8472
+
+[ml2]
+path_mtu=1550
diff --git a/scripts/stackinabox/post-config.sh b/scripts/stackinabox/post-config.sh
@@ -7,6 +7,7 @@ sudo iptables -t nat -A POSTROUTING -o enp0s3 -j MASQUERADE
 
 sudo ip link set dev enp0s3 mtu $MTU
 sudo ip link set dev enp0s8 mtu $MTU
+sudo ip link set dev enp0s9 mtu 1450
 
 source /home/vagrant/demo-openrc.sh labstack
 echo "recreating router"
diff --git a/scripts/stackinabox/stack-noscreenrc b/scripts/stackinabox/stack-noscreenrc
@@ -47,3 +47,13 @@
 /usr/local/bin/heat-api-cfn --config-file=/etc/heat/heat.conf >> /opt/stack/logs/h-api-cfn.log 2>&1 &
 
 /usr/local/bin/heat-api-cloudwatch --config-file=/etc/heat/heat.conf >> /opt/stack/logs/h-api-cw.log 2>&1 &
+
+# /usr/local/bin/designate-central --config-file=/etc/designate/designate.conf >> /opt/stack/logs/designate-central.log 2>&1 &
+
+# /usr/local/bin/designate-api --config-file=/etc/designate/designate.conf >> /opt/stack/logs/designate-api.log 2>&1 &
+
+#/usr/local/bin/designate-manage pool-manager-cache sync >> /opt/stack/logs/designate-sync-pool-manager-cache.log 2>&1 &
+
+# /usr/local/bin/designate-pool-manager --config-file=/etc/designate/designate.conf >> /opt/stack/logs/designate-pool-manager.log 2>&1 &
+
+# /usr/local/bin/designate-mdns --config-file=/etc/designate/designate.conf >> /opt/stack/logs/designate-mdns.log 2>&1 &
diff --git a/vagrant/Personalization.dist b/vagrant/Personalization.dist
@@ -21,3 +21,29 @@ $memory = 8192
 $release_branch = "stable/mitaka"
 #Set to where second disk should be created
 $disk = "/home/freddy/VirtualBox VMs/stackinabox/box-disk2.vmdk"
+
+
+# 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 = "bento/ubuntu-16.04"
+
+# Box url
+$box_url = "https://atlas.hashicorp.com/bento/boxes/ubuntu-16.04"
+
+# Number of CPU's (min 2, recommend 4) adjust to your machine
+$cpus = 4
+
+# Amount of RAM (min 4096, recommed 8192) adjust to your machine
+$memory = 8192
+
+# Which release branch should we build? ( stable/juno | stable/kilo | stable/liberty | master )
+$release_branch = "stable/mitaka"
+
+# Second Disk (used for lxd backing store)
+$disk = '$HOME/VirtualBox VMs/stackinabox/ubuntu-16.04-amd64-disk2.vmdk'
diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile
@@ -75,6 +75,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     stackinabox.vm.provision "post-config", type: "shell", privileged: false, keep_color: false, path: File.expand_path(File.join(vagrant_dir, "..", "scripts", "stackinabox", "post-config.sh"), __FILE__), args: "#{$release_branch} #{$mtu}"
 
 #    stackinabox.vm.provision "file", source: File.expand_path(File.join(vagrant_dir, "..", "scripts", "stackinabox", "openrc"), __FILE__), destination: "/home/vagrant/openrc"
-#    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__)
+    stackinabox.vm.provision "docker-heat", type: "shell", privileged: false, keep_color: false, path: File.expand_path(File.join(vagrant_dir, "..", "scripts", "docker", "heat.sh"), __FILE__), args: "#{$release_branch}"
   end
 end
diff --git a/vagrant/build.sh b/vagrant/build.sh
diff --git a/vagrant/metadata.json b/vagrant/metadata.json
diff --git a/vagrant/package.sh b/vagrant/package.sh

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +# Vagrant
 +.DS_Store
 +*.xz
 +*.xz.*