commit 12414fe43077e12d7ef711951b1633ad31d73573
author Instrumental <jonathan.gathman@att.com> Tue Jan 22 10:27:32 2019 -0600
committer Instrumental <jonathan.gathman@att.com> Tue Jan 22 10:32:14 2019 -0600
tree 475166cee68c104b2f36625ef864a912aab50fa4
parent a5bcce655e339151445fbce2c129687e3bc8610a

Public and Private Locate entries

Issue-ID: AAF-723
Change-Id: I9dcd2e732ce64b39aaa57a6e9404f275f7ad540c
Signed-off-by: Instrumental <jonathan.gathman@att.com>

auth/sample/local/aaf.props

diff --git a/auth/sample/local/aaf.props b/auth/sample/local/aaf.props
index 4eb70a9..bae24d4 100644
--- a/auth/sample/local/aaf.props
+++ b/auth/sample/local/aaf.props
@@ -35,6 +35,12 @@
 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

auth/sample/local/initialConfig.props

diff --git a/auth/sample/local/initialConfig.props b/auth/sample/local/initialConfig.props
index fa2bc17..9c7e3df 100644
--- a/auth/sample/local/initialConfig.props
+++ b/auth/sample/local/initialConfig.props
@@ -17,11 +17,12 @@
 #  limitations under the License.

 #  ============LICENSE_END====================================================

 #

-aaf_locate_url=https://localhost:8095

-aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/AAF_NS.introspect:2.1/introspect

-aaf_oauth2_token_url=https://AAF_LOCATE_URL/AAF_NS.token:2.1/token

-aaf_url=https://AAF_LOCATE_URL/AAF_NS.service:2.1

 cadi_protocols=TLSv1.1,TLSv1.2

-cm_url=https://AAF_LOCATE_URL/AAF_NS.cm:2.1

-fs_url=https://AAF_LOCATE_URL/AAF_NS.fs.2.1

-gui_url=https://AAF_LOCATE_URL/AAF_NS.gui.2.1

+

+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