From 79b3803d64dcaeb4ca216452b1cc3393f395d26c Mon Sep 17 00:00:00 2001 From: Nicolas Braud-Santoni Date: Wed, 24 Feb 2016 03:20:52 +0100 Subject: [PATCH 1/2] admin_user plugin: Fix non-EC2 behaviour --- bootstrapvz/plugins/admin_user/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrapvz/plugins/admin_user/__init__.py b/bootstrapvz/plugins/admin_user/__init__.py index 9682ad5..f54e964 100644 --- a/bootstrapvz/plugins/admin_user/__init__.py +++ b/bootstrapvz/plugins/admin_user/__init__.py @@ -23,7 +23,7 @@ def resolve_tasks(taskset, manifest): taskset.add(tasks.AdminUserPassword) if 'pubkey' in manifest.plugins['admin_user']: taskset.add(tasks.AdminUserPublicKey) - else: + elif manifest.provider['name'] == 'ec2': taskset.add(tasks.AdminUserPublicKeyEC2) taskset.update([tasks.AddSudoPackage, From 72a9975ed9543ac70fadd31b2f863c5025b65a10 Mon Sep 17 00:00:00 2001 From: Nicolas Braud-Santoni Date: Thu, 25 Feb 2016 20:38:42 +0100 Subject: [PATCH 2/2] admin_user: Add warnings --- bootstrapvz/plugins/admin_user/__init__.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bootstrapvz/plugins/admin_user/__init__.py b/bootstrapvz/plugins/admin_user/__init__.py index f54e964..d9a5466 100644 --- a/bootstrapvz/plugins/admin_user/__init__.py +++ b/bootstrapvz/plugins/admin_user/__init__.py @@ -11,6 +11,7 @@ def validate_manifest(data, validator, error): def resolve_tasks(taskset, manifest): + import logging import tasks from bootstrapvz.common.tasks import ssh @@ -21,10 +22,14 @@ def resolve_tasks(taskset, manifest): if 'password' in manifest.plugins['admin_user']: taskset.discard(ssh.DisableSSHPasswordAuthentication) taskset.add(tasks.AdminUserPassword) + if 'pubkey' in manifest.plugins['admin_user']: taskset.add(tasks.AdminUserPublicKey) elif manifest.provider['name'] == 'ec2': + logging.getLogger(__name__).info("The SSH key will be obtained from EC2") taskset.add(tasks.AdminUserPublicKeyEC2) + elif 'password' not in manifest.plugins['admin_user']: + logging.getLogger(__name__).warn("No SSH key and no password set") taskset.update([tasks.AddSudoPackage, tasks.CreateAdminUser,