reconcile merge conflict
diff --git a/Dockerfile.cord b/Dockerfile.cord
index bc72016..5a2074d 100644
--- a/Dockerfile.cord
+++ b/Dockerfile.cord
@@ -2,5 +2,4 @@
MAINTAINER Andy Bavier <acb@cs.princeton.edu>
ADD xos/observers/vcpe/supervisor/vcpe-observer.conf /etc/supervisor/conf.d/
-RUN sed -i 's/ubuntu-vcpe4/trusty-server-multi-nic/' /opt/xos/cord/models.py
RUN sed -i 's/proxy_ssh=True/proxy_ssh=False/' /opt/xos/observers/vcpe/vcpe_observer_config
diff --git a/xos/core/models/service.py b/xos/core/models/service.py
index df2fa71..c46b165 100644
--- a/xos/core/models/service.py
+++ b/xos/core/models/service.py
@@ -336,10 +336,10 @@
""" A tenant that manages a container """
# this is a hack and should be replaced by something smarter...
- LOOK_FOR_IMAGES=["trusty-server-multi-nic",
- "ubuntu-vcpe4", # ONOS demo machine -- preferred vcpe image
+ LOOK_FOR_IMAGES=["ubuntu-vcpe4", # ONOS demo machine -- preferred vcpe image
"Ubuntu 14.04 LTS", # portal
"Ubuntu-14.04-LTS", # ONOS demo machine
+ "trusty-server-multi-nic", # CloudLab
]
class Meta: