Merge pull request #1083 from zenoss/feature/ZEN-19939

ZEN-19939: Fix service paths to not include names
zenoss · Sep 24, 2015 · 15faaa7 · 15faaa7
2 parents 037af71 + f5adfa3
commit 15faaa7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Products/ZenModel/ZenPack.py b/Products/ZenModel/ZenPack.py
@@ -1304,7 +1304,7 @@ def installDefaultCollectorServices(self, daemonPaths, template, tag):
             service = json.loads(template % templateParams)
             service = ZenPack.normalizeService(service, configMap, tag)
             serviceDefinitions.append(json.dumps(service))
-        servicePaths = ['/=Zenoss/=Collection/hub/collector'] * len(serviceDefinitions)
+        servicePaths = ['/zenoss-application/zenoss-collection/hub/collector'] * len(serviceDefinitions)
         self.installServiceDefinitions(serviceDefinitions, servicePaths)
 
 
@@ -1394,7 +1394,7 @@ def pathComponentCount(path):
 
             # ZEN-19575: change the path to reflect the new service definition
             if path == "/hub/collector":
-                path = "/=Zenoss/=Collection/hub/collector"
+                path = "/zenoss-application/zenoss-collection/hub/collector"
             parentServices = serviceTree.matchServicePath(ZenPack.currentServiceId,
                                                           path)
             for parentService in parentServices: