Ver Fonte

Update networking docs

Enis Afgan há 8 anos atrás
pai
commit
ed2587017f

+ 1 - 0
cloudbridge/cloud/providers/openstack/services.py

@@ -961,6 +961,7 @@ class OpenStackGatewayService(BaseGatewayService):
         super(OpenStackGatewayService, self).__init__(provider)
 
     def get_or_create_inet_gateway(self, network, name=None):
+        """For OS, inet gtw is any net that has `external` property set."""
         OpenStackInternetGateway.assert_valid_resource_name(name)
 
         for n in self.provider.networking.networks:

+ 7 - 7
docs/topics/networking.rst

@@ -71,18 +71,18 @@ of the block and allow up to 16 IP addresses within a subnet (``/28``).
 
 .. code-block:: python
 
-    net = self.provider.networking.networks.create(
+    net = provider.networking.networks.create(
         name='my-network', cidr_block='10.0.0.0/16')
     sn = net.create_subnet(name='my-subnet', cidr_block='10.0.0.0/28', zone=zone)
-    router = self.provider.networking.routers.create(network=net, name='my-router')
+    router = provider.networking.routers.create(network=net, name='my-router')
     router.attach_subnet(sn)
-    gateway = self.provider.networking.gateways.get_or_create_inet_gateway(name)
+    gateway = provider.networking.gateways.get_or_create_inet_gateway(name)
     router.attach_gateway(gateway)
 
 
 2. Allowing internet access to a launched VM
-----------------------------------------------
-The additional step that's require here is to assign a floating ip to the VM.
+--------------------------------------------
+The additional step that's required here is to assign a floating IP to the VM:
 
 .. code-block:: python
 
@@ -94,10 +94,10 @@ The additional step that's require here is to assign a floating ip to the VM.
 
     router = provider.networking.routers.create(network=net, name='my-router')
     router.attach_subnet(sn)
-    gateway = provider.networking.gateways.get_or_create_inet_gateway(name)
+    gateway = provider.networking.gateways.get_or_create_inet_gateway(net, name)
     router.attach_gateway(gateway)
 
-    fip = provider.networking.networks.create_floating_ip()
+    fip = provider.networking.floating_ips.create()
     vm.add_floating_ip(fip)