zuul
/
nodepool
Code Issues Proposed changes

Cleanup old keypair config option 

This old config option was not plumbed though anymore because we stopped
supported snapshot builds where this was used. Nodepool doesn't want to
manage keypairs at all so no creation/addition/listing/deletion, instead
it now accepts per label key name for precreated key in cloud regions
and will boot with that. Unfortunately this old code was "cleaning" up
this new label specified key for us as the only thing it did anymore.

Fix this by removing the dead code and stop deleting keys it doesn't
know about as we aren't managing keys anymore.

Change-Id: Ifff93de1ad81315141bfe1a53dc3d8578faee8e6
This commit is contained in:
Clark Boylan 2017-04-11 11:27:28 -07:00
parent 2d8e29a1bf
commit 7086877f0c
28 changed files with 0 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/source/configuration.rst
View File

@ -454,9 +454,6 @@ provider, the Nodepool image types are also defined (see
Default None
``keypair``
Default None
``networks`` (dict)
Specify custom Neutron networks that get attached to each
node. Specify the ``name`` of the network (a string).

1
nodepool/cmd/config_validator.py
View File

@ -59,7 +59,6 @@ class ConfigValidator:
'service-type': str,
'service-name': str,
'availability-zones': [str],
'keypair': str,
'cloud': str,
'username': str,
'password': str,

1
nodepool/config.py
View File

@ -202,7 +202,6 @@ def loadConfig(config_path):
p.nodepool_id = provider.get('nodepool-id', None)
p.region_name = provider.get('region-name')
p.max_servers = provider['max-servers']
p.keypair = provider.get('keypair', None)
p.pool = provider.get('pool', None)
p.rate = provider.get('rate', 1.0)
p.api_timeout = provider.get('api-timeout')

13
nodepool/fakeprovider.py
View File

@ -30,7 +30,6 @@ class Dummy(object):
IMAGE = 'Image'
INSTANCE = 'Instance'
FLAVOR = 'Flavor'
KEYPAIR = 'Keypair'
def __init__(self, kind, **kw):
self.__kind = kind
@ -95,7 +94,6 @@ class FakeOpenStackCloud(object):
Dummy(Dummy.FLAVOR, id='f2', ram=8192, name='Unreal Flavor'),
]
self._server_list = []
self._keypair_list = []
def _get(self, name_or_id, instance_list):
self.log.debug("Get %s in %s" % (name_or_id, repr(instance_list)))
@ -196,17 +194,6 @@ class FakeOpenStackCloud(object):
def list_flavors(self, get_extra=False):
return self._flavor_list
def create_keypair(self, name, public_key):
return self._create(
self._image_list, instance_type=Dummy.KEYPAIR,
name=name, public_key=public_key)
def list_keypairs(self):
return self._keypair_list
def delete_keypair(self, name):
self._delete(name, self._keypair_list)
def get_openstack_vars(self, server):
server.public_v4 = 'fake'
server.public_v6 = 'fake'

22
nodepool/provider_manager.py
View File

@ -18,7 +18,6 @@
import json
import logging
import paramiko
from contextlib import contextmanager
import shade
@ -167,22 +166,6 @@ class ProviderManager(object):
with shade_inner_exceptions():
return self._client.delete_image(name)
def addKeypair(self, name):
key = paramiko.RSAKey.generate(2048)
public_key = key.get_name() + ' ' + key.get_base64()
with shade_inner_exceptions():
self._client.create_keypair(name=name, public_key=public_key)
return key
def listKeypairs(self):
with shade_inner_exceptions():
keypairs = self._client.list_keypairs()
return keypairs
def deleteKeypair(self, name):
with shade_inner_exceptions():
return self._client.delete_keypair(name=name)
def createServer(self, name, min_ram, image_id=None, image_name=None,
az=None, key_name=None, name_filter=None,
config_drive=True, nodepool_node_id=None,
@ -349,11 +332,6 @@ class ProviderManager(object):
if not server:
raise NotFound()
key_name = server.get('key_name')
if key_name and key_name != self.provider.keypair:
with shade_inner_exceptions():
self._client.delete_keypair(name=server['key_name'])
self.log.debug('Deleting server %s' % server_id)
self.deleteServer(server_id)

1
nodepool/tests/fixtures/integration.yaml vendored
View File

@ -24,7 +24,6 @@ labels:
providers:
- name: real-provider
region-name: real-region
keypair: 'if-present-use-this-keypair'
username: 'real'
password: 'real'
auth-url: 'real'

1
nodepool/tests/fixtures/integration_osc.yaml vendored
View File

@ -24,7 +24,6 @@ labels:
providers:
- name: real-provider
cloud: real-cloud
keypair: 'if-present-use-this-keypair'
max-servers: 96
pool: 'real'
networks:

1
nodepool/tests/fixtures/leaked_node.yaml vendored
View File

@ -27,7 +27,6 @@ labels:
providers:
- name: fake-provider
region-name: fake-region
keypair: 'if-present-use-this-keypair'
username: 'fake'
password: 'fake'
auth-url: 'fake'

1
nodepool/tests/fixtures/leaked_node_nodepool_id.yaml vendored
View File

@ -27,7 +27,6 @@ labels:
providers:
- name: fake-provider
region-name: fake-region
keypair: 'if-present-use-this-keypair'
username: 'fake'
password: 'fake'
auth-url: 'fake'

1
nodepool/tests/fixtures/node.yaml vendored
View File

@ -27,7 +27,6 @@ labels:
providers:
- name: fake-provider
region-name: fake-region
keypair: 'if-present-use-this-keypair'
username: 'fake'
password: 'fake'
auth-url: 'fake'

1
nodepool/tests/fixtures/node_az.yaml vendored
View File

@ -27,7 +27,6 @@ labels:
providers:
- name: fake-provider
region-name: fake-region
keypair: 'if-present-use-this-keypair'
username: 'fake'
password: 'fake'
auth-url: 'fake'

2
nodepool/tests/fixtures/node_cmd.yaml vendored
View File

@ -30,7 +30,6 @@ labels:
providers:
- name: fake-provider1
keypair: 'if-present-use-this-keypair'
username: 'fake'
password: 'fake'
auth-url: 'fake'
@ -48,7 +47,6 @@ providers:
key: value
key2: value
- name: fake-provider2
keypair: 'if-present-use-this-keypair'
username: 'fake'
password: 'fake'
auth-url: 'fake'

1
nodepool/tests/fixtures/node_disabled_label.yaml vendored
View File

@ -27,7 +27,6 @@ labels:
providers:
- name: fake-provider
region-name: fake-region
keypair: 'if-present-use-this-keypair'
username: 'fake'
password: 'fake'
auth-url: 'fake'

1
nodepool/tests/fixtures/node_diskimage_fail.yaml vendored
View File

@ -27,7 +27,6 @@ labels:
providers:
- name: fake-provider
region-name: fake-region
keypair: 'if-present-use-this-keypair'
username: 'fake'
password: 'fake'
auth-url: 'fake'

1
nodepool/tests/fixtures/node_diskimage_pause.yaml vendored
View File

@ -32,7 +32,6 @@ labels:
providers:
- name: fake-provider
region-name: fake-region
keypair: 'if-present-use-this-keypair'
username: 'fake'
password: 'fake'
auth-url: 'fake'

1
nodepool/tests/fixtures/node_image_upload_pause.yaml vendored
View File

@ -32,7 +32,6 @@ labels:
providers:
- name: fake-provider
region-name: fake-region
keypair: 'if-present-use-this-keypair'
username: 'fake'
password: 'fake'
auth-url: 'fake'

3
nodepool/tests/fixtures/node_ipv6.yaml vendored
View File

@ -39,7 +39,6 @@ labels:
providers:
- name: fake-provider1
region-name: fake-region
keypair: 'if-present-use-this-keypair'
username: 'fake'
password: 'fake'
auth-url: 'fake'
@ -60,7 +59,6 @@ providers:
- name: fake-provider2
region-name: fake-region
keypair: 'if-present-use-this-keypair'
username: 'fake'
password: 'fake'
auth-url: 'fake'
@ -80,7 +78,6 @@ providers:
- name: fake-provider3
region-name: fake-region
keypair: 'if-present-use-this-keypair'
username: 'fake'
password: 'fake'
auth-url: 'fake'

1
nodepool/tests/fixtures/node_net_name.yaml vendored
View File

@ -27,7 +27,6 @@ labels:
providers:
- name: fake-provider
region-name: fake-region
keypair: 'if-present-use-this-keypair'
username: 'fake'
password: 'fake'
auth-url: 'fake'

1
nodepool/tests/fixtures/node_two_image.yaml vendored
View File

@ -32,7 +32,6 @@ labels:
providers:
- name: fake-provider
region-name: fake-region
keypair: 'if-present-use-this-keypair'
username: 'fake'
password: 'fake'
auth-url: 'fake'

1
nodepool/tests/fixtures/node_two_image_remove.yaml vendored
View File

@ -27,7 +27,6 @@ labels:
providers:
- name: fake-provider
region-name: fake-region
keypair: 'if-present-use-this-keypair'
username: 'fake'
password: 'fake'
auth-url: 'fake'

2
nodepool/tests/fixtures/node_two_provider.yaml vendored
View File

@ -28,7 +28,6 @@ labels:
providers:
- name: fake-provider
region-name: fake-region
keypair: 'if-present-use-this-keypair'
username: 'fake'
password: 'fake'
auth-url: 'fake'
@ -47,7 +46,6 @@ providers:
key2: value
- name: fake-provider2
region-name: fake-region
keypair: 'if-present-use-this-keypair'
username: 'fake'
password: 'fake'
auth-url: 'fake'

2
nodepool/tests/fixtures/node_two_provider_remove.yaml vendored
View File

@ -27,7 +27,6 @@ labels:
providers:
- name: fake-provider
region-name: fake-region
keypair: 'if-present-use-this-keypair'
username: 'fake'
password: 'fake'
auth-url: 'fake'
@ -46,7 +45,6 @@ providers:
key2: value
- name: fake-provider2
region-name: fake-region
keypair: 'if-present-use-this-keypair'
username: 'fake'
password: 'fake'
auth-url: 'fake'

2
nodepool/tests/fixtures/node_upload_fail.yaml vendored
View File

@ -28,7 +28,6 @@ labels:
providers:
- name: fake-provider1
region-name: fake-region
keypair: 'if-present-use-this-keypair'
username: 'fake'
password: 'fake'
auth-url: 'fake'
@ -48,7 +47,6 @@ providers:
SHOULD_FAIL: 'true'
- name: fake-provider2
region-name: fake-region
keypair: 'if-present-use-this-keypair'
username: 'fake'
password: 'fake'
auth-url: 'fake'

1
nodepool/tests/fixtures/node_vhd.yaml vendored
View File

@ -27,7 +27,6 @@ labels:
providers:
- name: fake-provider
region-name: fake-region
keypair: 'if-present-use-this-keypair'
username: 'fake'
password: 'fake'
auth-url: 'fake'

2
nodepool/tests/fixtures/node_vhd_and_qcow2.yaml vendored
View File

@ -28,7 +28,6 @@ labels:
providers:
- name: fake-provider1
region-name: fake-region
keypair: 'if-present-use-this-keypair'
username: 'fake'
password: 'fake'
auth-url: 'fake'
@ -48,7 +47,6 @@ providers:
key2: value
- name: fake-provider2
region-name: fake-region
keypair: 'if-present-use-this-keypair'
username: 'fake'
password: 'fake'
auth-url: 'fake'

1
nodepool/tests/fixtures/subnodes.yaml vendored
View File

@ -34,7 +34,6 @@ labels:
providers:
- name: fake-provider
region-name: fake-region
keypair: 'if-present-use-this-keypair'
username: 'fake'
password: 'fake'
auth-url: 'fake'

1
tools/fake-dib.yaml
View File

@ -31,7 +31,6 @@ labels:
providers:
- name: fake-provider
keypair: 'if-present-use-this-keypair'
region-name: 'fake-region'
username: 'fake'
password: 'fake'

1
tools/fake.yaml
View File

@ -41,7 +41,6 @@ labels:
providers:
- name: fake-provider
keypair: 'if-present-use-this-keypair'
region-name: 'fake-region'
username: 'fake'
password: 'fake'