Merge branch 'master' of github.com:open-cloud/xos
diff --git a/Dockerfile b/Dockerfile
index 5391fc6..9715a95 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:14.04.1
+FROM ubuntu:14.04.2
MAINTAINER Andy Bavier <acb@cs.princeton.edu>
# XXX Workaround for docker bug:
@@ -76,6 +76,7 @@
# For Observer
RUN git clone git://git.planet-lab.org/fofum.git /tmp/fofum
RUN cd /tmp/fofum; python setup.py install
+RUN rm -rf /tmp/fofum
RUN mkdir -p /usr/local/share /bin
ADD http://phantomjs.googlecode.com/files/phantomjs-1.7.0-linux-x86_64.tar.bz2 /usr/local/share/
diff --git a/xos/openstack_observer/steps/sync_controller_slices.py b/xos/openstack_observer/steps/sync_controller_slices.py
index df44fa5..619a6ed 100644
--- a/xos/openstack_observer/steps/sync_controller_slices.py
+++ b/xos/openstack_observer/steps/sync_controller_slices.py
@@ -5,6 +5,7 @@
from django.db.models import F, Q
from xos.config import Config
from observer.openstacksyncstep import OpenStackSyncStep
+from core.models import User
from core.models.slice import Slice, ControllerSlice
from core.models.controlleruser import ControllerUser
from util.logger import Logger, logging, logger
diff --git a/xos/xos_config b/xos/xos_config
index 1533542..a618905 100644
--- a/xos/xos_config
+++ b/xos/xos_config
@@ -32,6 +32,7 @@
ca_ssl_cert=/etc/ssl/certs/ca-certificates.crt
[observer]
+backoff_disabled=False
images_directory=/opt/xos/images
dependency_graph=/opt/xos/model-deps
logfile=/var/log/xos_backend.log