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

Manual merge of develop into opennebula-integration

Browse source
This commit is contained in:
M.Ravi 2017-04-26 10:40:52 +05:30
parent e9646c878e
commit cb4d96604c
3 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dynamicweb/settings/prod.py
View file

@ -2,6 +2,7 @@ from .base import *
ADMINS = ( ADMINS = (
('Nico Schottelius', 'nico.schottelius@ungleich.ch'), ('Nico Schottelius', 'nico.schottelius@ungleich.ch'),
('Raul Ascencio', 'raul.ascencio@yandex.com'),
('Tomislav Rupcic','tmslav@gmail.com'), ('Tomislav Rupcic','tmslav@gmail.com'),
) )

12
hosting/README-opennebula-integration.md
View file

@ -9,13 +9,17 @@ Assuming virtualenv is located at ~/python/env
sudo ~/python/env/bin/python setup.py install sudo ~/python/env/bin/python setup.py install
``` ```
2. Setup opennebula parameters in settings/local.py or settings/prod.py depending on deployment environment. The following are the parameters. Add them to the end of the file. Make sure to change them to fit your deployment. 2. Setup opennebula parameters in the `.env` file.
``` ```
# The user name of the OpenNebula infrastructure #############################################
# configurations for opennebula-integration #
#############################################
# The oneadmin user name of the OpenNebula infrastructure
OPENNEBULA_USERNAME='oneadmin' OPENNEBULA_USERNAME='oneadmin'
# The password of the OpenNebula infrastructure # The oneadmin password of the OpenNebula infrastructure
# The default credentials of the Sandbox OpenNebula VM is # The default credentials of the Sandbox OpenNebula VM is
# oneadmin:opennebula # oneadmin:opennebula
OPENNEBULA_PASSWORD='opennebula' OPENNEBULA_PASSWORD='opennebula'
@ -24,7 +28,7 @@ OPENNEBULA_PASSWORD = 'opennebula'
OPENNEBULA_PROTOCOL='http' OPENNEBULA_PROTOCOL='http'
# The ip address or the domain name of the opennebula infrastructure # The ip address or the domain name of the opennebula infrastructure
OPENNEBULA_DOMAIN = '192.168.182.173' OPENNEBULA_DOMAIN='192.168.182.124'
# The port to connect in order to send an xmlrpc request. The default # The port to connect in order to send an xmlrpc request. The default
# port is 2633 # port is 2633

1
hosting/models.py
View file

@ -1,6 +1,7 @@
import os import os
from django.db import models from django.db import models
from django.utils.translation import ugettext_lazy as _
from django.utils.functional import cached_property from django.utils.functional import cached_property
from Crypto.PublicKey import RSA from Crypto.PublicKey import RSA