Merge "Get rid of some useless code"

Jenkins · openstack-gerrit · commit 2ae37ac9e5da · 2015-01-23T19:22:41.000Z
diff --git a/examples/common.py b/examples/common.py
@@ -117,18 +117,11 @@ def set_option(cls, var, values):
         var = var.replace('OS_API_', '')
         var = var.lower()
         for kvp in values.split(','):
-            if var == 'region':
-                if '=' in kvp:
-                    service, value = kvp.split('=')
-                else:
-                    service = cls.pref.ALL
-                    value = kvp
+            if '=' in kvp:
+                service, value = kvp.split('=')
             else:
-                if '=' in kvp:
-                    service, value = kvp.split('=')
-                else:
-                    service = cls.pref.ALL
-                    value = kvp
+                service = cls.pref.ALL
+                value = kvp
             if var == 'name':
                 cls.pref.set_name(service, value)
             elif var == 'region':
