cloud-init-dev team mailing list archive

[Joshua Powers <josh.powers@xxxxxxxxxxxxx>]

Joshua Powers has proposed merging ~powersj/cloud-init:cii-ssh-keyname into cloud-init:master.

Commit message:
tests: rename generated ssh keys

This renames the generated ssh keys for integration testing in order to
comply with a request that the default private ssh key name of id_rsa
was generating security warnings.

Requested reviews:
  cloud-init commiters (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~powersj/cloud-init/+git/cloud-init/+merge/335855
-- 
Your team cloud-init commiters is requested to review the proposed merge of ~powersj/cloud-init:cii-ssh-keyname into cloud-init:master.

diff --git a/tests/cloud_tests/platforms.yaml b/tests/cloud_tests/platforms.yaml
index cb1c904..448aa98 100644
--- a/tests/cloud_tests/platforms.yaml
+++ b/tests/cloud_tests/platforms.yaml
@@ -6,8 +6,8 @@ default_platform_config:
     get_image_timeout: 300
     # maximum time to create instance (before waiting for cloud-init)
     create_instance_timeout: 60
-    private_key: id_rsa
-    public_key: id_rsa.pub
+    private_key: cloud_init_rsa
+    public_key: cloud_init_rsa.pub
 platforms:
     ec2:
         enabled: true
diff --git a/tests/cloud_tests/platforms/platforms.py b/tests/cloud_tests/platforms/platforms.py
index d4e5c56..1542b3b 100644
--- a/tests/cloud_tests/platforms/platforms.py
+++ b/tests/cloud_tests/platforms/platforms.py
@@ -33,7 +33,7 @@ class Platform(object):
 
     def _generate_ssh_keys(self, data_dir):
         """Generate SSH keys to be used with image."""
-        filename = os.path.join(data_dir, 'id_rsa')
+        filename = os.path.join(data_dir, self.config['private_key'])
 
         if os.path.exists(filename):
             c_util.del_file(filename)