diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst index 714747427..cdaef9b76 100644 --- a/doc/source/configuration.rst +++ b/doc/source/configuration.rst @@ -409,8 +409,7 @@ provider, the Nodepool image types are also defined (see 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. If the network should be the target of floating IP NAT, set - ``nat_destination`` to true. + true. ``ipv6-preferred`` If it is set to True, nodepool will try to find ipv6 in public net first diff --git a/nodepool/cmd/config_validator.py b/nodepool/cmd/config_validator.py index f92cf2801..bc987b427 100644 --- a/nodepool/cmd/config_validator.py +++ b/nodepool/cmd/config_validator.py @@ -51,7 +51,6 @@ class ConfigValidator: network = { 'name': v.Required(str), 'public': bool, - 'nat_destination': bool, } providers = { diff --git a/nodepool/config.py b/nodepool/config.py index 4873ccbe1..66a3f24f7 100644 --- a/nodepool/config.py +++ b/nodepool/config.py @@ -163,7 +163,6 @@ def loadConfig(config_path): n.name = network.get('name') n.id = None n.public = network.get('public', False) - n.nat_destination = network.get('nat_destination', False) p.ipv6_preferred = provider.get('ipv6-preferred') p.azs = provider.get('availability-zones') p.template_hostname = provider.get( @@ -312,22 +311,6 @@ def _cloudKwargsFromProvider(provider): if 'service-name' in provider: cloud_kwargs['compute-service-name'] = provider['service-name'] - if 'networks' in provider: - networks = [] - for network in provider.get('networks', []): - if 'net-id' in network: - name_or_id = network['net-id'] - elif 'net-label' in network: - name_or_id = network['net-label'] - else: - name_or_id = network.get('name') - external = network.get('public', False) - nat_destination = network.get('nat_destination', False) - networks.append(dict( - name=name_or_id, routes_externally=external, - nat_destination=nat_destination)) - cloud_kwargs['networks'] = networks - auth_kwargs = {} for auth_key in ( 'username', 'password', 'auth-url', 'project-id', 'project-name'): diff --git a/requirements.txt b/requirements.txt index 9cdc3143d..4be3d4cb0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,7 @@ PyMySQL PrettyTable>=0.6,<0.8 # shade has a looser requirement on six than nodepool, so install six first six>=1.7.0 -os-client-config>=1.17.0 +os-client-config>=1.2.0 shade>=1.6.2 diskimage-builder voluptuous