diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-05-08 12:56:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-05-08 12:56:03 +0000 |
| commit | aefb164f9b3693666cd8eed6fbd3261a7c959c24 (patch) | |
| tree | 974f8dfc06320428a0f8ef4c62e9d0afb6199ab9 /os_client_config/defaults.py | |
| parent | df6c73f1f1b1e703f1526d813759638320ee17e6 (diff) | |
| parent | 33634dda7219f334c5545cb93673311c8bc99130 (diff) | |
| download | os-client-config-0.8.2.tar.gz | |
Merge "Add flag to indicate where floating ips come from"0.8.2
Diffstat (limited to 'os_client_config/defaults.py')
| -rw-r--r-- | os_client_config/defaults.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/os_client_config/defaults.py b/os_client_config/defaults.py index 5f70d6e..9059502 100644 --- a/os_client_config/defaults.py +++ b/os_client_config/defaults.py @@ -16,8 +16,10 @@ _defaults = dict( auth_type='password', compute_api_version='2', 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', ) |