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 | |
| 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
| -rw-r--r-- | doc/source/vendor-support.rst | 5 | ||||
| -rw-r--r-- | os_client_config/defaults.py | 2 | ||||
| -rw-r--r-- | os_client_config/vendors.py | 3 |
3 files changed, 10 insertions, 0 deletions
diff --git a/doc/source/vendor-support.rst b/doc/source/vendor-support.rst index c75f012..1d5aff3 100644 --- a/doc/source/vendor-support.rst +++ b/doc/source/vendor-support.rst @@ -23,6 +23,7 @@ region-b.geo-1 US East * DNS Service Type is `hpext:dns` * Image API Version is 1 * Images must be in `qcow2` format +* Floating IPs are provided by Neutron Rackspace --------- @@ -44,6 +45,7 @@ HKG Hong Kong * Image API Version is 2 * Images must be in `vhd` format * Images must be uploaded using the Glance Task Interface +* Floating IPs are not needed Dreamhost --------- @@ -58,6 +60,7 @@ RegionOne Region One * Image API Version is 2 * Images must be in `raw` format +* Floating IPs are provided by Neutron Vexxhost -------- @@ -72,6 +75,7 @@ ca-ymq-1 Montreal * Image API Version is 2 * Images must be in `qcow2` format +* Floating IPs are not needed RunAbove -------- @@ -87,3 +91,4 @@ BHS-1 Beauharnois, QC * Image API Version is 2 * Images must be in `qcow2` format +* Floating IPs are not needed 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', ) diff --git a/os_client_config/vendors.py b/os_client_config/vendors.py index 5953729..2eecfa3 100644 --- a/os_client_config/vendors.py +++ b/os_client_config/vendors.py @@ -32,6 +32,7 @@ CLOUD_DEFAULTS = dict( image_api_version='2', image_api_use_tasks=True, image_format='vhd', + floating_ip_source=None, ), dreamhost=dict( auth=dict( @@ -48,6 +49,7 @@ CLOUD_DEFAULTS = dict( region_name='ca-ymq-1', image_api_version='2', image_format='qcow2', + floating_ip_source=None, ), runabove=dict( auth=dict( @@ -55,6 +57,7 @@ CLOUD_DEFAULTS = dict( ), image_api_version='2', image_format='qcow2', + floating_ip_source=None, ), ) |