Merge "Get correct protocol for domain Closes-Bug: 1406377"

openstack-archive · Jan 5, 2015 · 40f38d7 · 40f38d7
2 parents afb95b2 + 915f9ca
commit 40f38d7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/poppy/storage/cassandra/services.py b/poppy/storage/cassandra/services.py
@@ -536,7 +536,7 @@ def format_result(result):
                     for rule_i in o.get(
                         'rules', [])]) for o in origins]
 
-        domains = [domain.Domain(d['domain'])
+        domains = [domain.Domain(d['domain'], d.get('protocol', 'http'))
                    for d in domains]
 
         restrictions = [restriction.Restriction(