zuul
/
nodepool
Code Issues Proposed changes

Remove keypair from provider section 

This was an unused setting which was left over from when we supported
snapshots.

Change-Id: I940eaa57f5dad8761752d767c0dfa80f2a25c787
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-03-20 16:08:27 -04:00 committed by James E. Blair
parent f7289a5aca
commit c5c5be30f9
30 changed files with 0 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/source/configuration.rst
View File

@ -337,9 +337,6 @@ provider, the Nodepool image types are also defined (see
Default 3.
``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

@ -53,7 +53,6 @@ class ConfigValidator:
'name': str,
'region-name': str,
'availability-zones': [str],
'keypair': str,
'cloud': str,
'max-servers': int,
'max-concurrency': int,

1
nodepool/config.py
View File

@ -164,7 +164,6 @@ def loadConfig(config_path):
p.region_name = provider.get('region-name')
p.max_servers = provider['max-servers']
p.max_concurrency = provider.get('max-concurrency', -1)
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

@ -29,7 +29,6 @@ class Dummy(object):
IMAGE = 'Image'
INSTANCE = 'Instance'
FLAVOR = 'Flavor'
KEYPAIR = 'Keypair'
LOCATION = 'Server.Location'
def __init__(self, kind, **kw):
@ -96,7 +95,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)))
@ -205,17 +203,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

@ -17,7 +17,6 @@
# limitations under the License.
import logging
import paramiko
from contextlib import contextmanager
import shade
@ -166,22 +165,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=None, nodepool_node_id=None,
@ -344,11 +327,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

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

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

@ -17,7 +17,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

@ -20,7 +20,6 @@ labels:
providers:
- name: fake-provider
region-name: fake-region
keypair: 'if-present-use-this-keypair'
max-servers: 96
pool: 'fake'
networks:

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

@ -23,7 +23,6 @@ providers:
region-name: fake-region
availability-zones:
- az1
keypair: 'if-present-use-this-keypair'
max-servers: 96
pool: 'fake'
networks:

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

@ -20,7 +20,6 @@ labels:
providers:
- name: fake-provider
region-name: fake-region
keypair: 'if-present-use-this-keypair'
max-servers: 96
pool: 'fake'
networks:

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

@ -23,7 +23,6 @@ labels:
providers:
- name: fake-provider1
keypair: 'if-present-use-this-keypair'
max-servers: 96
pool: 'fake'
networks:
@ -37,7 +36,6 @@ providers:
key: value
key2: value
- name: fake-provider2
keypair: 'if-present-use-this-keypair'
max-servers: 96
pool: 'fake'
networks:

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

@ -20,7 +20,6 @@ labels:
providers:
- name: fake-provider
region-name: fake-region
keypair: 'if-present-use-this-keypair'
max-servers: 96
pool: 'fake'
networks:

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

@ -20,7 +20,6 @@ labels:
providers:
- name: fake-provider
region-name: fake-region
keypair: 'if-present-use-this-keypair'
max-servers: 96
pool: 'fake'
networks:

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

@ -25,7 +25,6 @@ labels:
providers:
- name: fake-provider
region-name: fake-region
keypair: 'if-present-use-this-keypair'
max-servers: 96
pool: 'fake'
networks:

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

@ -25,7 +25,6 @@ labels:
providers:
- name: fake-provider
region-name: fake-region
keypair: 'if-present-use-this-keypair'
max-servers: 96
pool: 'fake'
networks:

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

@ -32,7 +32,6 @@ labels:
providers:
- name: fake-provider1
region-name: fake-region
keypair: 'if-present-use-this-keypair'
max-servers: 96
pool: 'fake'
networks:
@ -49,7 +48,6 @@ providers:
- name: fake-provider2
region-name: fake-region
keypair: 'if-present-use-this-keypair'
max-servers: 96
pool: 'fake'
networks:
@ -65,7 +63,6 @@ providers:
- name: fake-provider3
region-name: fake-region
keypair: 'if-present-use-this-keypair'
max-servers: 96
pool: 'fake'
networks:

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

@ -20,7 +20,6 @@ labels:
providers:
- name: fake-provider
region-name: fake-region
keypair: 'if-present-use-this-keypair'
max-servers: 96
pool: 'fake'
networks:
@ -35,7 +34,6 @@ providers:
key2: value
- name: fake-provider2
region-name: fake-region
keypair: 'if-present-use-this-keypair'
max-servers: 96
pool: 'fake'
networks:

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

@ -21,7 +21,6 @@ providers:
- name: fake-provider
cloud: 'fake'
region-name: fake-region
keypair: 'if-present-use-this-keypair'
max-servers: 96
pool: 'fake'
launch-retries: 2

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

@ -22,7 +22,6 @@ providers:
region-name: fake-region
availability-zones:
- az1
keypair: 'if-present-use-this-keypair'
max-servers: 96
pool: 'fake'
networks:

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

@ -20,7 +20,6 @@ labels:
providers:
- name: fake-provider
region-name: fake-region
keypair: 'if-present-use-this-keypair'
max-servers: 96
pool: 'fake'
networks:

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

@ -22,7 +22,6 @@ providers:
region-name: fake-region
availability-zones:
- az1
keypair: 'if-present-use-this-keypair'
max-servers: 2
pool: 'fake'
networks:

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

@ -25,7 +25,6 @@ labels:
providers:
- name: fake-provider
region-name: fake-region
keypair: 'if-present-use-this-keypair'
max-servers: 96
pool: 'fake'
networks:

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

@ -20,7 +20,6 @@ labels:
providers:
- name: fake-provider
region-name: fake-region
keypair: 'if-present-use-this-keypair'
max-servers: 96
pool: 'fake'
networks:

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

@ -21,7 +21,6 @@ labels:
providers:
- name: fake-provider
region-name: fake-region
keypair: 'if-present-use-this-keypair'
max-servers: 96
pool: 'fake'
networks:
@ -36,7 +35,6 @@ providers:
key2: value
- name: fake-provider2
region-name: fake-region
keypair: 'if-present-use-this-keypair'
max-servers: 96
pool: 'fake'
networks:

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

@ -20,7 +20,6 @@ labels:
providers:
- name: fake-provider
region-name: fake-region
keypair: 'if-present-use-this-keypair'
max-servers: 96
pool: 'fake'
networks:
@ -35,7 +34,6 @@ providers:
key2: value
- name: fake-provider2
region-name: fake-region
keypair: 'if-present-use-this-keypair'
max-servers: 96
pool: 'fake'
networks:

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

@ -21,7 +21,6 @@ labels:
providers:
- name: fake-provider1
region-name: fake-region
keypair: 'if-present-use-this-keypair'
max-servers: 2
pool: 'fake'
networks:
@ -37,7 +36,6 @@ providers:
SHOULD_FAIL: 'true'
- name: fake-provider2
region-name: fake-region
keypair: 'if-present-use-this-keypair'
max-servers: 2
pool: 'fake'
networks:

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

@ -20,7 +20,6 @@ labels:
providers:
- name: fake-provider
region-name: fake-region
keypair: 'if-present-use-this-keypair'
max-servers: 96
pool: 'fake'
image-type: vhd

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

@ -21,7 +21,6 @@ labels:
providers:
- name: fake-provider1
region-name: fake-region
keypair: 'if-present-use-this-keypair'
max-servers: 2
pool: 'fake'
image-type: vhd
@ -37,7 +36,6 @@ providers:
key2: value
- name: fake-provider2
region-name: fake-region
keypair: 'if-present-use-this-keypair'
max-servers: 2
pool: 'fake'
image-type: qcow2

1
tools/fake-dib.yaml
View File

@ -25,7 +25,6 @@ labels:
providers:
- name: fake-provider
keypair: 'if-present-use-this-keypair'
region-name: 'fake-region'
max-servers: 96
images:

1
tools/fake.yaml
View File

@ -33,7 +33,6 @@ labels:
providers:
- name: fake-provider
keypair: 'if-present-use-this-keypair'
region-name: 'fake-region'
max-servers: 96
images: