AAA-147: Jolokia credentials are backed by AAA

[controller.git] / opendaylight / commons / jolokia / src / main / resources / org.jolokia.osgi.cfg

diff --git a/opendaylight/commons/jolokia/src/main/resources/org.jolokia.osgi.cfg b/opendaylight/commons/jolokia/src/main/resources/org.jolokia.osgi.cfg
index fdad9e9a2ba2740376605b75de74be65da551346..bb9c367597369ecf0f494141999a3cd365f7c641 100644 (file)
--- a/opendaylight/commons/jolokia/src/main/resources/org.jolokia.osgi.cfg
+++ b/opendaylight/commons/jolokia/src/main/resources/org.jolokia.osgi.cfg
@@ -1,4 +1,13 @@
 #ODL Default Jolokia Configuration File
-org.jolokia.authMode=basic
-org.jolokia.user=admin
-org.jolokia.password=admin
+
+# The default strategy is to use "service-all", which requires AAA to be installed to access
+# Jolokia REST endpoints at runtime.  AAA is responsible for creating and registering the
+# Authenticator service with the OSGi service registry.
+org.jolokia.authMode=service-all
+
+# The below may be uncommented by the operator to enable basic authentication for Jolokia. Prior
+# to the Oxygen release, only basic authentication was available.  This is provided to show how
+# backwards compatibility can be achieved.
+#org.jolokia.authMode=basic
+#org.jolokia.user=admin
+#org.jolokia.password=admin