kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-22 09:50:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #291 from nbraud/admin_user

Browse source 
admin_user plugin: Fix non-EC2 behaviour
This commit is contained in:
Anders Ingemann 2016-03-01 00:01:12 +01:00
commit 8a8d07991e
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bootstrapvz/plugins/admin_user/__init__.py
View file

@ -11,6 +11,7 @@ def validate_manifest(data, validator, error):
def resolve_tasks(taskset, manifest): def resolve_tasks(taskset, manifest):
import logging
import tasks import tasks
from bootstrapvz.common.tasks import ssh from bootstrapvz.common.tasks import ssh
@ -21,10 +22,14 @@ def resolve_tasks(taskset, manifest):
if 'password' in manifest.plugins['admin_user']: if 'password' in manifest.plugins['admin_user']:
taskset.discard(ssh.DisableSSHPasswordAuthentication) taskset.discard(ssh.DisableSSHPasswordAuthentication)
taskset.add(tasks.AdminUserPassword) taskset.add(tasks.AdminUserPassword)
if 'pubkey' in manifest.plugins['admin_user']: if 'pubkey' in manifest.plugins['admin_user']:
taskset.add(tasks.AdminUserPublicKey) taskset.add(tasks.AdminUserPublicKey)
else: elif manifest.provider['name'] == 'ec2':
logging.getLogger(__name__).info("The SSH key will be obtained from EC2")
taskset.add(tasks.AdminUserPublicKeyEC2) 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, taskset.update([tasks.AddSudoPackage,
tasks.CreateAdminUser, tasks.CreateAdminUser,