From 7086877f0c0d1410a8afa25db3bb0bc08941e407 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Tue, 11 Apr 2017 11:27:28 -0700
Subject: [PATCH] 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
---
 doc/source/configuration.rst                  |  3 ---
 nodepool/cmd/config_validator.py              |  1 -
 nodepool/config.py                            |  1 -
 nodepool/fakeprovider.py                      | 13 -----------
 nodepool/provider_manager.py                  | 22 -------------------
 nodepool/tests/fixtures/integration.yaml      |  1 -
 nodepool/tests/fixtures/integration_osc.yaml  |  1 -
 nodepool/tests/fixtures/leaked_node.yaml      |  1 -
 .../fixtures/leaked_node_nodepool_id.yaml     |  1 -
 nodepool/tests/fixtures/node.yaml             |  1 -
 nodepool/tests/fixtures/node_az.yaml          |  1 -
 nodepool/tests/fixtures/node_cmd.yaml         |  2 --
 .../tests/fixtures/node_disabled_label.yaml   |  1 -
 .../tests/fixtures/node_diskimage_fail.yaml   |  1 -
 .../tests/fixtures/node_diskimage_pause.yaml  |  1 -
 .../fixtures/node_image_upload_pause.yaml     |  1 -
 nodepool/tests/fixtures/node_ipv6.yaml        |  3 ---
 nodepool/tests/fixtures/node_net_name.yaml    |  1 -
 nodepool/tests/fixtures/node_two_image.yaml   |  1 -
 .../tests/fixtures/node_two_image_remove.yaml |  1 -
 .../tests/fixtures/node_two_provider.yaml     |  2 --
 .../fixtures/node_two_provider_remove.yaml    |  2 --
 nodepool/tests/fixtures/node_upload_fail.yaml |  2 --
 nodepool/tests/fixtures/node_vhd.yaml         |  1 -
 .../tests/fixtures/node_vhd_and_qcow2.yaml    |  2 --
 nodepool/tests/fixtures/subnodes.yaml         |  1 -
 tools/fake-dib.yaml                           |  1 -
 tools/fake.yaml                               |  1 -
 28 files changed, 70 deletions(-)

diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
index 588096ea9..786190414 100644
--- a/doc/source/configuration.rst
+++ b/doc/source/configuration.rst
@@ -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).
diff --git a/nodepool/cmd/config_validator.py b/nodepool/cmd/config_validator.py
index 5d1316117..0409e0a45 100644
--- a/nodepool/cmd/config_validator.py
+++ b/nodepool/cmd/config_validator.py
@@ -59,7 +59,6 @@ class ConfigValidator:
             'service-type': str,
             'service-name': str,
             'availability-zones': [str],
-            'keypair': str,
             'cloud': str,
             'username': str,
             'password': str,
diff --git a/nodepool/config.py b/nodepool/config.py
index f812b551f..c9440135b 100644
--- a/nodepool/config.py
+++ b/nodepool/config.py
@@ -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')
diff --git a/nodepool/fakeprovider.py b/nodepool/fakeprovider.py
index 2ee40b3a7..bb51f034d 100644
--- a/nodepool/fakeprovider.py
+++ b/nodepool/fakeprovider.py
@@ -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'
diff --git a/nodepool/provider_manager.py b/nodepool/provider_manager.py
index d2d0e47b1..13e7cbbe1 100644
--- a/nodepool/provider_manager.py
+++ b/nodepool/provider_manager.py
@@ -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)
 
diff --git a/nodepool/tests/fixtures/integration.yaml b/nodepool/tests/fixtures/integration.yaml
index 0a6e4c926..f22e55c29 100644
--- a/nodepool/tests/fixtures/integration.yaml
+++ b/nodepool/tests/fixtures/integration.yaml
@@ -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'
diff --git a/nodepool/tests/fixtures/integration_osc.yaml b/nodepool/tests/fixtures/integration_osc.yaml
index 3222a960d..fc8f9786e 100644
--- a/nodepool/tests/fixtures/integration_osc.yaml
+++ b/nodepool/tests/fixtures/integration_osc.yaml
@@ -24,7 +24,6 @@ labels:
 providers:
   - name: real-provider
     cloud: real-cloud
-    keypair: 'if-present-use-this-keypair'
     max-servers: 96
     pool: 'real'
     networks:
diff --git a/nodepool/tests/fixtures/leaked_node.yaml b/nodepool/tests/fixtures/leaked_node.yaml
index e84cf2d99..fb0c24759 100644
--- a/nodepool/tests/fixtures/leaked_node.yaml
+++ b/nodepool/tests/fixtures/leaked_node.yaml
@@ -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'
diff --git a/nodepool/tests/fixtures/leaked_node_nodepool_id.yaml b/nodepool/tests/fixtures/leaked_node_nodepool_id.yaml
index 667caac97..e935a8c79 100644
--- a/nodepool/tests/fixtures/leaked_node_nodepool_id.yaml
+++ b/nodepool/tests/fixtures/leaked_node_nodepool_id.yaml
@@ -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'
diff --git a/nodepool/tests/fixtures/node.yaml b/nodepool/tests/fixtures/node.yaml
index 6636d3a2d..235bd622f 100644
--- a/nodepool/tests/fixtures/node.yaml
+++ b/nodepool/tests/fixtures/node.yaml
@@ -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'
diff --git a/nodepool/tests/fixtures/node_az.yaml b/nodepool/tests/fixtures/node_az.yaml
index b78e67d08..99f9f8a25 100644
--- a/nodepool/tests/fixtures/node_az.yaml
+++ b/nodepool/tests/fixtures/node_az.yaml
@@ -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'
diff --git a/nodepool/tests/fixtures/node_cmd.yaml b/nodepool/tests/fixtures/node_cmd.yaml
index 3c18b82bc..aff57623e 100644
--- a/nodepool/tests/fixtures/node_cmd.yaml
+++ b/nodepool/tests/fixtures/node_cmd.yaml
@@ -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'
diff --git a/nodepool/tests/fixtures/node_disabled_label.yaml b/nodepool/tests/fixtures/node_disabled_label.yaml
index 6bdc3040a..6e4e23c14 100644
--- a/nodepool/tests/fixtures/node_disabled_label.yaml
+++ b/nodepool/tests/fixtures/node_disabled_label.yaml
@@ -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'
diff --git a/nodepool/tests/fixtures/node_diskimage_fail.yaml b/nodepool/tests/fixtures/node_diskimage_fail.yaml
index 0787d62c8..281150f06 100644
--- a/nodepool/tests/fixtures/node_diskimage_fail.yaml
+++ b/nodepool/tests/fixtures/node_diskimage_fail.yaml
@@ -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'
diff --git a/nodepool/tests/fixtures/node_diskimage_pause.yaml b/nodepool/tests/fixtures/node_diskimage_pause.yaml
index a8a8e1861..ea9bfb87f 100644
--- a/nodepool/tests/fixtures/node_diskimage_pause.yaml
+++ b/nodepool/tests/fixtures/node_diskimage_pause.yaml
@@ -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'
diff --git a/nodepool/tests/fixtures/node_image_upload_pause.yaml b/nodepool/tests/fixtures/node_image_upload_pause.yaml
index 0232e852d..a34083b01 100644
--- a/nodepool/tests/fixtures/node_image_upload_pause.yaml
+++ b/nodepool/tests/fixtures/node_image_upload_pause.yaml
@@ -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'
diff --git a/nodepool/tests/fixtures/node_ipv6.yaml b/nodepool/tests/fixtures/node_ipv6.yaml
index 2cd1c6e8c..74d0ffaec 100644
--- a/nodepool/tests/fixtures/node_ipv6.yaml
+++ b/nodepool/tests/fixtures/node_ipv6.yaml
@@ -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'
diff --git a/nodepool/tests/fixtures/node_net_name.yaml b/nodepool/tests/fixtures/node_net_name.yaml
index 8af31f150..b2f1c9fb2 100644
--- a/nodepool/tests/fixtures/node_net_name.yaml
+++ b/nodepool/tests/fixtures/node_net_name.yaml
@@ -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'
diff --git a/nodepool/tests/fixtures/node_two_image.yaml b/nodepool/tests/fixtures/node_two_image.yaml
index f55d8ffc4..5f9131c59 100644
--- a/nodepool/tests/fixtures/node_two_image.yaml
+++ b/nodepool/tests/fixtures/node_two_image.yaml
@@ -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'
diff --git a/nodepool/tests/fixtures/node_two_image_remove.yaml b/nodepool/tests/fixtures/node_two_image_remove.yaml
index 6636d3a2d..235bd622f 100644
--- a/nodepool/tests/fixtures/node_two_image_remove.yaml
+++ b/nodepool/tests/fixtures/node_two_image_remove.yaml
@@ -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'
diff --git a/nodepool/tests/fixtures/node_two_provider.yaml b/nodepool/tests/fixtures/node_two_provider.yaml
index 849c360a5..00910ea62 100644
--- a/nodepool/tests/fixtures/node_two_provider.yaml
+++ b/nodepool/tests/fixtures/node_two_provider.yaml
@@ -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'
diff --git a/nodepool/tests/fixtures/node_two_provider_remove.yaml b/nodepool/tests/fixtures/node_two_provider_remove.yaml
index 85310516e..db1e7a5b6 100644
--- a/nodepool/tests/fixtures/node_two_provider_remove.yaml
+++ b/nodepool/tests/fixtures/node_two_provider_remove.yaml
@@ -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'
diff --git a/nodepool/tests/fixtures/node_upload_fail.yaml b/nodepool/tests/fixtures/node_upload_fail.yaml
index 799f84d0b..8093bbb43 100644
--- a/nodepool/tests/fixtures/node_upload_fail.yaml
+++ b/nodepool/tests/fixtures/node_upload_fail.yaml
@@ -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'
diff --git a/nodepool/tests/fixtures/node_vhd.yaml b/nodepool/tests/fixtures/node_vhd.yaml
index 12bfd34b8..4f0f63706 100644
--- a/nodepool/tests/fixtures/node_vhd.yaml
+++ b/nodepool/tests/fixtures/node_vhd.yaml
@@ -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'
diff --git a/nodepool/tests/fixtures/node_vhd_and_qcow2.yaml b/nodepool/tests/fixtures/node_vhd_and_qcow2.yaml
index b2b28e15f..d2e8ac030 100644
--- a/nodepool/tests/fixtures/node_vhd_and_qcow2.yaml
+++ b/nodepool/tests/fixtures/node_vhd_and_qcow2.yaml
@@ -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'
diff --git a/nodepool/tests/fixtures/subnodes.yaml b/nodepool/tests/fixtures/subnodes.yaml
index d076178c8..cc6eb327b 100644
--- a/nodepool/tests/fixtures/subnodes.yaml
+++ b/nodepool/tests/fixtures/subnodes.yaml
@@ -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'
diff --git a/tools/fake-dib.yaml b/tools/fake-dib.yaml
index 120994f9e..44d7179a0 100644
--- a/tools/fake-dib.yaml
+++ b/tools/fake-dib.yaml
@@ -31,7 +31,6 @@ labels:
 
 providers:
   - name: fake-provider
-    keypair: 'if-present-use-this-keypair'
     region-name: 'fake-region'
     username: 'fake'
     password: 'fake'
diff --git a/tools/fake.yaml b/tools/fake.yaml
index 0df2ddae1..a89a7dcfc 100644
--- a/tools/fake.yaml
+++ b/tools/fake.yaml
@@ -41,7 +41,6 @@ labels:
 
 providers:
   - name: fake-provider
-    keypair: 'if-present-use-this-keypair'
     region-name: 'fake-region'
     username: 'fake'
     password: 'fake'