From 73721f16d2a4c24ad58151f193e1971597fdbb53 Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 15 Aug 2017 02:29:01 +0530 Subject: [PATCH] Added ONEADMIN_USER_SSH_PUBLIC_KEY parameter to load oneadmin user's ssh key by default when creating VM via DCL flow --- datacenterlight/views.py | 1 + dynamicweb/settings/base.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index f7a07c7e..0851a33f 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -482,6 +482,7 @@ class OrderConfirmationView(DetailView): vm_id = manager.create_vm( template_id=vm_template_id, specs=specs, + ssh_key=settings.ONEADMIN_USER_SSH_PUBLIC_KEY, vm_name="{email}-{template_name}-{date}".format( email=user.get('email'), template_name=template.get('name'), diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index 40187f84..a837f0f2 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -504,6 +504,9 @@ OPENNEBULA_PORT = env('OPENNEBULA_PORT') # default value is /RPC2 OPENNEBULA_ENDPOINT = env('OPENNEBULA_ENDPOINT') +# The public ssh key of the oneadmin user +ONEADMIN_USER_SSH_PUBLIC_KEY = env('ONEADMIN_USER_SSH_PUBLIC_KEY') + # dcl email configurations DCL_TEXT = env('DCL_TEXT') DCL_SUPPORT_FROM_ADDRESS = env('DCL_SUPPORT_FROM_ADDRESS')