Unblocking the dsvm gate

- Creating temp n-dhcp log file
- Commenting out installation of Docker as we don't use
  Docker on the gate

Partial-Bug: #1563019

Change-Id: Idc18bc8e28e15777d544b9537dde76a329aba329

devstack/plugin.sh

@@ -362,14 +362,14 @@ solum_install_core_os() {
 #----------------
 
 if is_service_enabled solum-api solum-conductor solum-deployer solum-worker; then
-    echo "Checking for Docker"
-    if [ ! -f /usr/bin/docker ] ; then
-       echo deb http://get.docker.com/ubuntu docker main | sudo tee /etc/apt/sources.list.d/docker.list
-       sudo apt-key adv --keyserver pgp.mit.edu --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
-       sudo apt-get install -y apt-transport-https
-       sudo apt-get update
-       sudo apt-get install -y lxc-docker-1.7.0
-    fi
+    #echo "Checking for Docker"
+    #if [ ! -f /usr/bin/docker ] ; then
+    #   echo deb http://get.docker.com/ubuntu docker main | sudo tee /etc/apt/sources.list.d/docker.list
+    #   sudo apt-key adv --keyserver pgp5.ai.mit.edu --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
+    #   sudo apt-get install -y apt-transport-https
+    #   sudo apt-get update
+    #   sudo apt-get install -y --force-yes lxc-docker-1.7.0
+    #fi
     if [[ "$1" == "stack" && "$2" == "install" ]]; then
         echo_summary "Installing Solum"
         install_solum

devstack/settings

@@ -62,7 +62,6 @@ enable_service q-meta
 enable_service neutron
 disable_service n-net
 
-
 # Enable solum services
 enable_service solum-api
 enable_service solum-conductor

functionaltests/post_test_hook.sh

@@ -49,3 +49,10 @@ sudo more /etc/tempest/tempest.conf
 
 cd /opt/stack/new/solum/functionaltests
 sudo ./run_tests.sh
+
+# Hack
+sudo touch /opt/stack/logs/screen-n-dhcp.log
+sudo sh -c 'echo creating temporary dhcp log file >> /opt/stack/logs/screen-n-dhcp.log'
+
+sudo touch /opt/stack/logs/screen-n-dhcp.txt
+sudo sh -c 'echo creating temporary dhcp log file >> /opt/stack/logs/screen-n-dhcp.txt'