Merge "Don't reference OS::Nova::FloatingIP in the docs"

2 files changed, 2 insertions, 41 deletions

diff --git a/doc/source/template_guide/basic_resources.rst b/doc/source/template_guide/basic_resources.rst
index 6bbbf393e..a0dcb17bc 100644
--- a/doc/source/template_guide/basic_resources.rst
+++ b/doc/source/template_guide/basic_resources.rst
@@ -137,45 +137,6 @@ port:
 
 Create and associate a floating IP to an instance
 -------------------------------------------------
-You can use two sets of resources to create and associate floating IPs to
-instances.
-
-OS::Nova resources
-++++++++++++++++++
-Use the :ref:`OS::Nova::FloatingIP` resource to create a floating IP, and
-the :ref:`OS::Nova::FloatingIPAssociation` resource to associate the
-floating IP to an instance.
-
-The following example creates an instance and a floating IP, and associate the
-floating IP to the instance:
-
-.. code-block:: yaml
-
-    resources:
-      floating_ip:
-        type: OS::Nova::FloatingIP
-        properties:
-          pool: public
-
-      inst1:
-        type: OS::Nova::Server
-        properties:
-          flavor: m1.small
-          image: ubuntu-trusty-x86_64
-          networks:
-            - network: private
-
-      association:
-        type: OS::Nova::FloatingIPAssociation
-        properties:
-          floating_ip: { get_resource: floating_ip }
-          server_id: { get_resource: inst1 }
-
-OS::Neutron resources
-+++++++++++++++++++++
-.. note::
-   The Networking service (neutron) must be enabled on your OpenStack
-   deployment to use these resources.
 
 Use the :ref:`OS::Neutron::FloatingIP` resource to create a floating IP, and
 the :ref:`OS::Neutron::FloatingIPAssociation` resource to associate the
diff --git a/doc/source/template_guide/environment.rst b/doc/source/template_guide/environment.rst
index fb6a2bdf9..1fa72246e 100644
--- a/doc/source/template_guide/environment.rst
+++ b/doc/source/template_guide/environment.rst
@@ -170,10 +170,10 @@ identifier, and must reference either another resource's ID or the URL of an
 existing template file.
 
 The following example maps a new ``OS::Networking::FloatingIP``
-resource to an existing ``OS::Nova::FloatingIP`` resource::
+resource to an existing ``OS::Neutron::FloatingIP`` resource::
 
   resource_registry:
-    "OS::Networking::FloatingIP": "OS::Nova::FloatingIP"
+    "OS::Networking::FloatingIP": "OS::Neutron::FloatingIP"
 
 You can use wildcards to map multiple resources, for example to map all
 ``OS::Neutron`` resources to ``OS::Network``::