From 4ac37bffd664bbc2d6d419d9420393193573320d Mon Sep 17 00:00:00 2001 From: Instrumental Date: Wed, 10 Apr 2019 13:01:30 -0500 Subject: switch Internal/External Locator Names for Dublin Issue-ID: AAF-808 Change-Id: If7c600cddef0f7d0fce1a8f7b1518d9ffe0983fe Signed-off-by: Instrumental --- auth/sample/local/initialConfig.props | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'auth/sample/local/initialConfig.props') diff --git a/auth/sample/local/initialConfig.props b/auth/sample/local/initialConfig.props index 6ea1d537..8b01d951 100644 --- a/auth/sample/local/initialConfig.props +++ b/auth/sample/local/initialConfig.props @@ -17,8 +17,6 @@ # limitations under the License. # ============LICENSE_END==================================================== # -cadi_protocols=TLSv1.1,TLSv1.2 - ################################ # Locator info # @@ -31,20 +29,21 @@ cadi_protocols=TLSv1.1,TLSv1.2 aaf_locator_app_ns=%AAF_NS aaf_locator_name=%NS.%N aaf_locator_name.docker=%CNS.%NS.%N -aaf_locator_name.helm=%CNS.%NS.%N -aaf_locator_name.oom=%CNS%.%NS.%N +aaf_root_ns=org.osaaf.aaf + +# Dublin +aaf_locator_name.oom=%NS.%N +aaf_locator_name.helm=%NS.%N +aaf_locator_public_name.oom=public.%NS.%N +aaf_locator_public_name.helm=public.%NS.%N + +# EL Alto and beyond +# aaf_locator_name.oom=%CNS.%NS.%N +# aaf_locator_name.helm=%CNS.%NS.%N + aaf_locator_fqdn.docker=aaf-%N aaf_locator_fqdn.helm=aaf-%N.%CNS aaf_locator_fqdn.oom=aaf-%N.%CNS -################################ -# AAF URLs -################################ -aaf_locate_url=https://localhost:8095 -aaf_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.service:2.1 -aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.oauth:2.1/introspect -aaf_oauth2_token_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.oauth:2.1/token -cm_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.cm:2.1 -gui_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.gui.2.1 -fs_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.fs.2.1 - +# initial trusted CAs +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 -- cgit 1.2.3-korg