Merge pull request #31 from EGI-FCTF/stable/folsom
reintroducing use of occi_custom_location_hostname
This commit is contained in:
commit
5a7d4d67f4
|
@ -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 storage
|
||||||
from occi_os_api.nova_glue import net
|
from occi_os_api.nova_glue import net
|
||||||
|
|
||||||
|
from nova.flags import FLAGS
|
||||||
|
|
||||||
class OCCIRegistry(occi_registry.NonePersistentRegistry):
|
class OCCIRegistry(occi_registry.NonePersistentRegistry):
|
||||||
"""
|
"""
|
||||||
|
@ -56,6 +57,11 @@ class OCCIRegistry(occi_registry.NonePersistentRegistry):
|
||||||
|
|
||||||
self._setup_network()
|
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):
|
def get_extras(self, extras):
|
||||||
"""
|
"""
|
||||||
Get data which is encapsulated in the extras.
|
Get data which is encapsulated in the extras.
|
||||||
|
|
Loading…
Reference in New Issue