#1046 lets load the ZK user from zookeeper

fabric8io · Apr 15, 2014 · c431fc0 · c431fc0
1 parent 1890ad4
commit c431fc0
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/fabric/fabric-core/src/main/java/io/fabric8/service/FabricServiceImpl.java b/fabric/fabric-core/src/main/java/io/fabric8/service/FabricServiceImpl.java
@@ -718,9 +718,16 @@ public String getZookeeperUrl() {
     @Override
     public String getZooKeeperUser() {
         assertValid();
-        return "admin";
-        // TODO
-        // return getZookeeperInfo("zookeeper.user");
+        String answer = null;
+        try {
+            answer = getZookeeperInfo("zookeeper.user");
+        } catch (Exception e) {
+            LOGGER.warn("could not find zookeeper.user: " + e, e);
+        }
+        if (Strings.isNullOrEmpty(answer)) {
+            answer = "admin";
+        }
+        return answer;
     }
 
     @Override