summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-27 20:30:11 +0000
committerGerrit Code Review <review@openstack.org>2015-07-27 20:30:11 +0000
commit0567c717162f6a5643d15b526aa68d3b3eadb5ce (patch)
tree57aa2a8ea61dee7614bc1d2ab38f5338aa99627c
parentb2d10751eaea6e1b9fe15a202a18a98d2c25c95f (diff)
parent212ce988609fafc830fcb59f42d31eacefc62565 (diff)
downloados-client-config-0567c717162f6a5643d15b526aa68d3b3eadb5ce.tar.gz
Merge "Clarify floating ip use for vendors"1.6.0
-rw-r--r--doc/source/vendor-support.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/source/vendor-support.rst b/doc/source/vendor-support.rst
index 314e362..3cf39e0 100644
--- a/doc/source/vendor-support.rst
+++ b/doc/source/vendor-support.rst
@@ -37,6 +37,7 @@ region-b.geo-1 US East
============== ================
* DNS Service Type is `hpext:dns`
+* Public IPv4 is provided via NAT with Neutron Floating IP
rackspace
---------
@@ -79,7 +80,7 @@ RegionOne Region One
* Image API Version is 2
* Images must be in `raw` format
-* Public IPv4 is provided via Floating IP from Neutron
+* Public IPv4 is provided via NAT with Neutron Floating IP
* IPv6 is provided to every server
vexxhost
@@ -139,7 +140,7 @@ RegionOne RegionOne
============== ================
* Identity API Version is 2
-* Public IPv4 is provided via Floating IP from Nova
+* Public IPv4 is provided via NAT with Nova Floating IP
* Floating IPs are provided by Nova
* Security groups are provided by Nova