moep/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #448 from pcoder/task/3699/add_oneadmin_ssh_key

Browse source 
Task/3699/Added oneadmin ssh key by default to the created VM via DCL flow
This commit is contained in:
Pcoder 2017-08-15 20:08:52 +02:00 • committed by GitHub
commit c053c76186
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
datacenterlight/views.py
View file

@ -482,6 +482,7 @@ class OrderConfirmationView(DetailView):
vm_id = manager.create_vm( vm_id = manager.create_vm(
template_id=vm_template_id, template_id=vm_template_id,
specs=specs, specs=specs,
ssh_key=settings.ONEADMIN_USER_SSH_PUBLIC_KEY,
vm_name="{email}-{template_name}-{date}".format( vm_name="{email}-{template_name}-{date}".format(
email=user.get('email'), email=user.get('email'),
template_name=template.get('name'), template_name=template.get('name'),

3
dynamicweb/settings/base.py
View file

@ -504,6 +504,9 @@ OPENNEBULA_PORT = env('OPENNEBULA_PORT')
# default value is /RPC2 # default value is /RPC2
OPENNEBULA_ENDPOINT = env('OPENNEBULA_ENDPOINT') 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 email configurations
DCL_TEXT = env('DCL_TEXT') DCL_TEXT = env('DCL_TEXT')
DCL_SUPPORT_FROM_ADDRESS = env('DCL_SUPPORT_FROM_ADDRESS') DCL_SUPPORT_FROM_ADDRESS = env('DCL_SUPPORT_FROM_ADDRESS')