Merge "Future.java - sonar fixes"

[aaf/authz.git] / auth / sample / local / initialConfig.props

diff --git a/auth/sample/local/initialConfig.props b/auth/sample/local/initialConfig.props
index 9c7e3df..8b01d95 100644 (file)
--- a/auth/sample/local/initialConfig.props
+++ b/auth/sample/local/initialConfig.props
@@ -17,12 +17,33 @@
 #  limitations under the License.\r
 #  ============LICENSE_END====================================================\r
 #\r
-cadi_protocols=TLSv1.1,TLSv1.2\r
+################################\r
+# Locator info\r
+#\r
+# Sample versions for \r
+#   1) no container\r
+#   2) Docker\r
+#   3) Helm (Kubernetes and Helm)\r
+#   4) OOM (Kubernetes with OOM)\r
+################################\r
+aaf_locator_app_ns=%AAF_NS\r
+aaf_locator_name=%NS.%N\r
+aaf_locator_name.docker=%CNS.%NS.%N\r
+aaf_root_ns=org.osaaf.aaf\r
+\r
+# Dublin\r
+aaf_locator_name.oom=%NS.%N\r
+aaf_locator_name.helm=%NS.%N\r
+aaf_locator_public_name.oom=public.%NS.%N\r
+aaf_locator_public_name.helm=public.%NS.%N\r
+\r
+# EL Alto and beyond\r
+# aaf_locator_name.oom=%CNS.%NS.%N\r
+# aaf_locator_name.helm=%CNS.%NS.%N\r
+\r
+aaf_locator_fqdn.docker=aaf-%N\r
+aaf_locator_fqdn.helm=aaf-%N.%CNS\r
+aaf_locator_fqdn.oom=aaf-%N.%CNS\r
 \r
-aaf_locate_url=https://localhost:8095\r
-aaf_url=https://AAF_LOCATE_URL/%C%AAF_NS.service:2.1\r
-aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/%C%AAF_NS.introspect:2.1/introspect\r
-aaf_oauth2_token_url=https://AAF_LOCATE_URL/%C%AAF_NS.token:2.1/token\r
-cm_url=https://AAF_LOCATE_URL/%C%AAF_NS.cm:2.1\r
-gui_url=https://AAF_LOCATE_URL/%C%AAF_NS.gui.2.1\r
-fs_url=https://AAF_LOCATE_URL/%C%AAF_NS.fs.2.1\r
+# initial trusted CAs\r
+cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US\r