summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2015-05-09 09:41:36 -0400
committerMonty Taylor <mordred@inaugust.com>2015-05-12 08:36:33 -0400
commitb9cdb7666580d81b956a045c0d10d697f0963164 (patch)
tree0844f73dbd4d71902b6f8cfd281ec341de024a45
parent2f1e6c13bee31a7d43ef80847d764648afdb9578 (diff)
downloados-client-config-b9cdb7666580d81b956a045c0d10d697f0963164.tar.gz
Sort defaults list for less conflicts
Change-Id: Ic27c50f745a093cc20e3f22f09698f7ae643bc83
-rw-r--r--os_client_config/defaults.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/os_client_config/defaults.py b/os_client_config/defaults.py
index 9059502..bf9a26d 100644
--- a/os_client_config/defaults.py
+++ b/os_client_config/defaults.py
@@ -15,11 +15,11 @@
_defaults = dict(
auth_type='password',
compute_api_version='2',
+ floating_ip_source='neutron',
identity_api_version='2',
image_api_use_tasks=False,
image_api_version='1',
network_api_version='2',
object_api_version='1',
volume_api_version='1',
- floating_ip_source='neutron',
)