diff options
| author |   Sai Gandham <sai.gandham@att.com> | 2019-02-01 15:13:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-02-01 15:13:16 +0000 |
| commit | e36daf12cf4c5aa4b22fa3cec66a79ff2e2b8b94 (patch) | |
| tree | 76d8b5e81d853e33a06f86c4478f5616e83a1b51 /auth/sample/local | |
| parent | 73223229c68129715fcd7b0c9d128345f13b3b4d (diff) | |
| parent | 3505a52ac853c134ecaf40f2977667de8770ec59 (diff) | |
Merge "Implement public private locator"
Diffstat (limited to 'auth/sample/local')
| -rw-r--r-- | auth/sample/local/aaf.props | 6 | ||||
| -rw-r--r-- | auth/sample/local/initialConfig.props | 34 |
2 files changed, 28 insertions, 12 deletions
diff --git a/auth/sample/local/aaf.props b/auth/sample/local/aaf.props index bae24d42..4eb70a9b 100644 --- a/auth/sample/local/aaf.props +++ b/auth/sample/local/aaf.props @@ -35,12 +35,6 @@ cadi_truststore=/opt/app/osaaf/public/truststoreONAPall.jks cadi_truststore_password=changeit cadi_x509_issuers= -# Locator info -aaf_locator_ns=AAF_NS -aaf_locator_fqdn.docker=aaf-%N -aaf_locator_fqdn.oom=%CNS.aaf-%N -aaf_locator_fqdn.helm=%CNS.aaf-%N - # Other aaf_data_dir=/opt/app/osaaf/data cadi_token_dir=/opt/app/osaaf/tokens diff --git a/auth/sample/local/initialConfig.props b/auth/sample/local/initialConfig.props index 9c7e3df0..91d5338f 100644 --- a/auth/sample/local/initialConfig.props +++ b/auth/sample/local/initialConfig.props @@ -19,10 +19,32 @@ #
cadi_protocols=TLSv1.1,TLSv1.2
+################################
+# Locator info
+#
+# Sample versions for
+# 1) no container
+# 2) Docker
+# 3) Helm (Kubernetes and Helm)
+# 4) OOM (Kubernetes with OOM)
+################################
+aaf_locator_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_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/%C%AAF_NS.service:2.1
-aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/%C%AAF_NS.introspect:2.1/introspect
-aaf_oauth2_token_url=https://AAF_LOCATE_URL/%C%AAF_NS.token:2.1/token
-cm_url=https://AAF_LOCATE_URL/%C%AAF_NS.cm:2.1
-gui_url=https://AAF_LOCATE_URL/%C%AAF_NS.gui.2.1
-fs_url=https://AAF_LOCATE_URL/%C%AAF_NS.fs.2.1
+aaf_url=https://AAF_LOCATE_URL/%C.%AAF_NS.service:2.1
+aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/%C.%AAF_NS.oauth:2.1/introspect
+aaf_oauth2_token_url=https://AAF_LOCATE_URL/%C.%AAF_NS.oauth:2.1/token
+cm_url=https://AAF_LOCATE_URL/%C.%AAF_NS.cm:2.1
+gui_url=https://AAF_LOCATE_URL/%C.%AAF_NS.gui.2.1
+fs_url=https://AAF_LOCATE_URL/%C.%AAF_NS.fs.2.1
+
|