Merge "Update configuration docs for network and pool settings"

doc/source/configuration.rst

@@ -302,11 +302,9 @@ provider, the Nodepool image types are also defined (see
       boot-timeout: 120
       launch-timeout: 900
       template-hostname: 'template-{image.name}-{timestamp}'
-      pool: 'public'
       ipv6-preferred: False
       networks:
         - name: 'some-network-name'
-          public: True
       images:
         - name: trusty
           min-ram: 8192
@@ -423,9 +421,7 @@ provider, the Nodepool image types are also defined (see
 
   ``networks`` (dict)
     Specify custom Neutron networks that get attached to each
-    node. Specify the ``name`` of the network (a string) and if the
-    network routes to the Internet, set the boolean ``public`` to
-    true.
+    node. Specify the ``name`` of the network (a string).
 
   ``ipv6-preferred``
     If it is set to True, nodepool will try to find ipv6 in public net first
@@ -433,10 +429,6 @@ provider, the Nodepool image types are also defined (see
     jenkins slave definition. If ipv6 is not found or the key is not
     specified or set to False, ipv4 address will be used.
 
-  ``pool``
-    Specify a floating ip pool in cases where the 'public' pool is unavailable
-    or undesirable.
-
   ``api-timeout`` (compatability)
     Timeout for the OpenStack API calls client in seconds. Prefer setting
     this in `clouds.yaml`

nodepool/cmd/config_validator.py

@@ -49,7 +49,7 @@ class ConfigValidator:
 
         network = {
             'name': v.Required(str),
-            'public': bool,
+            'public': bool,  # Ignored, but kept for backwards compat
         }
 
         providers = {
@@ -66,7 +66,7 @@ class ConfigValidator:
             'project-id': str,
             'project-name': str,
             'max-servers': int,
-            'pool': str,
+            'pool': str,  # Ignored, but kept for backwards compat
             'image-type': str,
             'networks': [v.Any(old_network, network)],
             'ipv6-preferred': bool,

nodepool/config.py

@@ -218,7 +218,6 @@ def loadConfig(config_path):
             else:
                 n.name = network.get('name')
                 n.id = None
-            n.public = network.get('public', False)
         p.ipv6_preferred = provider.get('ipv6-preferred')
         p.clean_floating_ips = provider.get('clean-floating-ips')
         p.azs = provider.get('availability-zones')