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

Merge pull request #240 from levivm/opennebula_api

Browse source 
Opennebula api
This commit is contained in:
Levi Velázquez 2017-05-13 18:00:49 -05:00 • committed by GitHub
commit aa8e886745
2 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dynamicweb/settings/prod.py
View file

@ -3,7 +3,7 @@ from .base import *
ADMINS = ( ADMINS = (
('Nico Schottelius', 'nico.schottelius@ungleich.ch'), ('Nico Schottelius', 'nico.schottelius@ungleich.ch'),
('Raul Ascencio', 'raul.ascencio@yandex.com'), ('Raul Ascencio', 'raul.ascencio@yandex.com'),
('Tomislav Rupcic','tmslav@gmail.com'), ('Web team', 'web-team@ungleich.ch')
) )
# ('Sanghee Kim', 'sanghee.kim@ungleich.ch'), # ('Sanghee Kim', 'sanghee.kim@ungleich.ch'),

6
opennebula_api/models.py
View file

@ -212,18 +212,12 @@ class OpenNebulaManager():
return template_pool return template_pool
def get_templates(self): def get_templates(self):
print("TEMPLATES")
print(self._get_template_pool())
try: try:
public_templates = [ public_templates = [
template template
for template in self._get_template_pool() for template in self._get_template_pool()
if 'public-' in template.name if 'public-' in template.name
] ]
print("TEMPLATES")
print(public_templates)
return public_templates return public_templates
except ConnectionRefusedError: except ConnectionRefusedError:
return [] return []