commit 2e71f761addd130670e109cd51b26246758bc3c9
author Andy Bavier <acb@cs.princeton.edu> Wed Sep 09 19:08:12 2015 -0400
committer Andy Bavier <acb@cs.princeton.edu> Wed Sep 09 19:08:12 2015 -0400
tree 48419fcc05cdacacf2fe1fee63943d0bb9ceab15
parent 27d1923a25efbb6a683a298d9a0ea46d86c4c0ca

Clean up image selection

Dockerfile.cord

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

xos/cord/models.py

diff --git a/xos/cord/models.py b/xos/cord/models.py
index 37b29a5..d411daf 100644
--- a/xos/cord/models.py
+++ b/xos/cord/models.py
@@ -485,6 +485,7 @@
         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
                         ]
         for image_name in LOOK_FOR_IMAGES:
             images = Image.objects.filter(name = image_name)