diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-05-28 14:11:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-05-28 14:11:27 +0000 |
| commit | 979827150da569f3a8e588f7f1220f3f6cf5c2fa (patch) | |
| tree | 6e54967c6b890f206e142f099e0121510a35b97f | |
| parent | b16d6d391779cc0a1bb156f0cf4468521f4e5d4e (diff) | |
| parent | 6daed957c3647efb3d47d7e85065a33a74e39047 (diff) | |
| download | os-client-config-979827150da569f3a8e588f7f1220f3f6cf5c2fa.tar.gz | |
Merge "Add flag to indicate handling of security groups"
| -rw-r--r-- | doc/source/vendor-support.rst | 6 | ||||
| -rw-r--r-- | os_client_config/defaults.py | 1 | ||||
| -rw-r--r-- | os_client_config/vendors.py | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/doc/source/vendor-support.rst b/doc/source/vendor-support.rst index dea27d1..02e0937 100644 --- a/doc/source/vendor-support.rst +++ b/doc/source/vendor-support.rst @@ -24,6 +24,7 @@ region-b.geo-1 US East * Image API Version is 1 * Images must be in `qcow2` format * Floating IPs are provided by Neutron +* Security groups are provided by Neutron Rackspace --------- @@ -46,6 +47,7 @@ HKG Hong Kong * Images must be in `vhd` format * Images must be uploaded using the Glance Task Interface * Floating IPs are not needed +* Security groups are not supported Dreamhost --------- @@ -61,6 +63,7 @@ RegionOne Region One * Image API Version is 2 * Images must be in `raw` format * Floating IPs are provided by Neutron +* Security groups are provided by Neutron Vexxhost -------- @@ -76,6 +79,7 @@ ca-ymq-1 Montreal * Image API Version is 2 * Images must be in `qcow2` format * Floating IPs are not needed +* Security groups are provided by Neutron RunAbove -------- @@ -92,6 +96,7 @@ BHS-1 Beauharnois, QC * Image API Version is 2 * Images must be in `qcow2` format * Floating IPs are not needed +* Security groups are provided by Neutron UnitedStack ----------- @@ -109,3 +114,4 @@ gd1 Guangdong * Image API Version is 2 * Images must be in `raw` format * Floating IPs are not needed +* Security groups are provided by Neutron diff --git a/os_client_config/defaults.py b/os_client_config/defaults.py index 14b8209..11a94c4 100644 --- a/os_client_config/defaults.py +++ b/os_client_config/defaults.py @@ -23,6 +23,7 @@ _defaults = dict( image_api_version='1', network_api_version='2', object_api_version='1', + secgroup_source='neutron', volume_api_version='1', ) diff --git a/os_client_config/vendors.py b/os_client_config/vendors.py index dec63dc..ed8d047 100644 --- a/os_client_config/vendors.py +++ b/os_client_config/vendors.py @@ -33,6 +33,7 @@ CLOUD_DEFAULTS = dict( image_api_use_tasks=True, image_format='vhd', floating_ip_source=None, + secgroup_source=None, ), dreamhost=dict( auth=dict( |