stackforge
/
occi-os
Code Issues Proposed changes

Merge pull request #31 from EGI-FCTF/stable/folsom 

reintroducing use of occi_custom_location_hostname
This commit is contained in:
tmetsch 2013-02-28 01:23:42 -08:00
parent a455e5300b 90b71e315b
commit 5a7d4d67f4
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
occi_os_api/registry.py
View File

@ -37,6 +37,7 @@ from occi_os_api.nova_glue import vm
from occi_os_api.nova_glue import storage
from occi_os_api.nova_glue import net
from nova.flags import FLAGS
class OCCIRegistry(occi_registry.NonePersistentRegistry):
"""
@ -56,6 +57,11 @@ class OCCIRegistry(occi_registry.NonePersistentRegistry):
self._setup_network()
def set_hostname(self, hostname):
if FLAGS.occi_custom_location_hostname:
hostname = FLAGS.occi_custom_location_hostname
super(OCCIRegistry, self).set_hostname(hostname)
def get_extras(self, extras):
"""
Get data which is encapsulated in the extras.