Fixed Ralph2 sync device subscriber mgmt ip assignment (#2497)

Fixed Ralph2 sync device subscriber mgmt ip assignment * Delete mgmt when ip is empty, otherwise assign it * Bumped pyhermes version to 0.1.3
allegro · Jun 24, 2016 · 9403415 · 9403415
1 parent 52bb3ad
commit 9403415
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/requirements/hermes.txt b/requirements/hermes.txt
@@ -1 +1 @@
-pyhermes==0.1.2
+pyhermes==0.1.3
diff --git a/src/ralph/ralph2_sync/subscribers.py b/src/ralph/ralph2_sync/subscribers.py
@@ -100,8 +100,11 @@ def sync_device_to_ralph3(data):
     """
     dca = ImportedObjects.get_object_from_old_pk(DataCenterAsset, data['id'])
     dca.hostname = data['hostname']
-    dca.management_ip = data['management_ip']
-    dca.management_hostname = data['management_hostname']
+    if data['management_ip']:
+        dca.management_ip = data['management_ip']
+        dca.management_hostname = data['management_hostname']
+    else:
+        del dca.management_ip
     if data['service'] and data['environment']:
         dca.service_env = ServiceEnvironment.objects.get(
             service__uid=data['service'],

diff --git a/src/ralph/settings/base.py b/src/ralph/settings/base.py
@@ -347,9 +347,8 @@ def os_env_true(var, default=''):
 
 
 ENABLE_HERMES_INTEGRATION = os_env_true('ENABLE_HERMES_INTEGRATION')
-HERMES = {
-    'ENABLED': ENABLE_HERMES_INTEGRATION
-}
+HERMES = json.loads(os.environ.get('HERMES', '{}'))
+HERMES['ENABLED'] = ENABLE_HERMES_INTEGRATION
 
 if ENABLE_HERMES_INTEGRATION:
     INSTALLED_APPS += (