From 0f28ca680ee4a059d50f65568219ef58d123002a Mon Sep 17 00:00:00 2001
From: David Schroeder <david.schroeder@hp.com>
Date: Thu, 2 Oct 2014 17:01:57 -0600
Subject: [PATCH] Updates to devstack build profile

- Increase memory of devstack server from 5GB to 7GB
- Update autostack script to reflect upstream changes
  (remove ceilometer hack)
- Disable Neutron, which was preventing VM from provisioning images
- Remove Glance from local.conf; it's already installed by default
- Added instance pre-creation steps to documentation

Change-Id: Ia3259cf440e5f16b194d8339a176f2d919b23bc4
---
 Vagrantfile                                   |  2 +-
 cookbooks/ds-build/files/default/autostack.sh | 16 +++++++--------
 cookbooks/ds-build/files/default/local.conf   | 13 +++++-------
 cookbooks/ds-build/metadata.rb                |  2 +-
 ds-build/README.md                            | 20 ++++++++++++++-----
 ds-build/Vagrantfile                          |  2 +-
 6 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 955cac9..4ddb6fb 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -38,7 +38,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     ds.vm.network :private_network, ip: "192.168.10.5"
     ds.vm.network :private_network, ip: "10.1.2.44"
     ds.vm.provider "virtualbox" do |vb|
-      vb.memory = 5280
+      vb.memory = 7168
       vb.cpus = 4
     end
     ds.vm.provision :chef_solo do |chef|
diff --git a/cookbooks/ds-build/files/default/autostack.sh b/cookbooks/ds-build/files/default/autostack.sh
index 7cf99ad..d56c0e0 100755
--- a/cookbooks/ds-build/files/default/autostack.sh
+++ b/cookbooks/ds-build/files/default/autostack.sh
@@ -56,7 +56,7 @@ fi
 
 for line in `cat $basedir/devstack/stack-screenrc |tr -d "\r"`; do
     if  [[ $line == stuff* ]]; then
-echo
+        echo
         # Extract the command line to run this service
         command=`echo "$line" |sed 's/^stuff //;s/"//g'`
         base_command=`echo $command |sed 's:.*bin/::;s/ .*//'`
@@ -64,17 +64,14 @@ echo
         # Skip screen sessions that are only a tail command
         [[ $command == *tail* ]] && continue
 
-	# Ceilometer's stack-screenrc invocation differs from all the others
-	if [ `echo "$command" |grep -c ceilometer` = 1 ]; then
-		base_command=`echo $command |sed "s/cd ; //;s/ libvirtd '//;s/ .*//"`
-		parent='/opt/stack/ceilometer'
-	else
-        	# Determine an appropriate log directory
-        	parent=`echo "$command" |cut -d' ' -f2 |sed 's/;//'`
-	fi
+        # Find a good log directory by first determining the parent
+        #+ Openstack service (nova, glance, etc.)
+        parent=`echo "$base_command" |cut -d- -f1`
+
         logdir="/var/log/`basename $parent`"
         logfile="$base_command.log"
 
+        # Now, create the upstart script from this template
         echo "Creating /etc/init/$base_command.conf"
 
         cat > "/etc/init/$base_command.conf" <<EOF
@@ -92,6 +89,7 @@ respawn
 
 exec su -c "$command --log-dir=$logdir --log-file=$logfile" $unpriv_user
 EOF
+
     # Swift processes do not support logfiles, so modify the init script
     if [ `echo "$command" |grep -c swift` = 1 ]; then
         sed -i 's/--log.*"/"/' /etc/init/$base_command.conf
diff --git a/cookbooks/ds-build/files/default/local.conf b/cookbooks/ds-build/files/default/local.conf
index 1eb5a53..e93ad86 100644
--- a/cookbooks/ds-build/files/default/local.conf
+++ b/cookbooks/ds-build/files/default/local.conf
@@ -31,12 +31,9 @@ enable_service ceilometer-alarm-evaluator ceilometer-alarm-notifier
 # Enable the ceilometer api services
 enable_service ceilometer-api
 
-# Neutron
-Q_PLUGIN=linuxbridge
-disable_service n-net
-enable_service neutron q-svc q-agt q-dhcp q-l3 q-meta
-enable_service q-fwaas q-vpn q-metering
-
-# Glance
-enable_service g-api g-reg
+# Neutron (disabled for now)
+#Q_PLUGIN=linuxbridge
+#disable_service n-net
+#enable_service neutron q-svc q-agt q-dhcp q-l3 q-meta
+#enable_service q-fwaas q-vpn q-metering
 
diff --git a/cookbooks/ds-build/metadata.rb b/cookbooks/ds-build/metadata.rb
index db777de..aa87db7 100644
--- a/cookbooks/ds-build/metadata.rb
+++ b/cookbooks/ds-build/metadata.rb
@@ -4,5 +4,5 @@ maintainer_email "hpcs-mon@hp.com"
 license          "All rights reserved"
 description      "Build customized devstack server"
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          "0.0.2"
+version          "0.0.3"
 depends          "apt"
diff --git a/ds-build/README.md b/ds-build/README.md
index d664da6..b94b8be 100644
--- a/ds-build/README.md
+++ b/ds-build/README.md
@@ -13,13 +13,9 @@ The following services are enabled:
 - Heat
 - Horizon
 - Keystone
-- Neutron
 - Nova
 - Swift
 
-Note that with Neutron, `Q_PLUGIN` is set to linuxbridge rather than
-openvswitch.
-
 # Upstart instead of screen
 
 The cookbook includes a script which creates Upstart init scripts for each of
@@ -37,8 +33,22 @@ progress from another terminal by running `vagrant ssh` and then
 `tail -f /opt/stack/logs/stack.sh.log`
 
 ## Packaging for VagrantCloud
+To ensure that this VM can provision its own instances, launch and delete
+an instance prior to packging for VagrantCloud.
+- Open http://192.168.10.5 in a web browser 
+- Log in using default admin credentials specified above
+- Click on 'Project' at left, then 'Instances'
+- Click the 'Launch Instance' button
+- Enter an Instance Name, any name will do
+- Select Flavor 'm1.tiny'
+- Set Instance Boot Source to 'Boot from image'
+- Choose 'cirros' as the Image Name
+- Click the 'Launch' button
+- Once the image is created successfully, terminate it
+- Sign out from the web interface; you are now ready to package the box image
+
 From within the `ds-build` directory, run this command to build a new
-VagrantCloud box image after `vagrant up` completed successfully:
+VagrantCloud box image:
 ```
 box='devstack.box'; [ -e ../$box ] && rm -v ../$box ; vagrant package devstack --output $box
 ```
diff --git a/ds-build/Vagrantfile b/ds-build/Vagrantfile
index 7b0c5a0..026f466 100644
--- a/ds-build/Vagrantfile
+++ b/ds-build/Vagrantfile
@@ -38,7 +38,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     ds.vm.box = "ubuntu/trusty64"
     ds.vm.network :private_network, ip: "192.168.10.5"
     ds.vm.provider "virtualbox" do |vb|
-      vb.memory = 5280
+      vb.memory = 7180
       vb.cpus = 4
     end
     ds.vm.provision :chef_solo do |chef|