Merge pull request #225 from ibuildthecloud/label-to-add-url

Add label io.rancher.container.cattle_url=true to get CATTLE_URL env var
rancher · Mar 8, 2016 · d078e23 · d078e23
2 parents d66742d + d53ff6a
commit d078e23
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/cattle/plugins/docker/agent.py b/cattle/plugins/docker/agent.py
@@ -3,8 +3,16 @@
 from urlparse import urlparse
 
 
+def _has_label(instance):
+    try:
+        return instance.labels['io.rancher.container.cattle_url'] == 'true'
+    except:
+        pass
+    return False
+
+
 def setup_cattle_config_url(instance, create_config):
-    if instance.get('agentId') is None:
+    if instance.get('agentId') is None and not _has_label(instance):
         return
 
     if 'labels' not in create_config: