summaryrefslogtreecommitdiffstats
path: root/auth/sample/local
diff options
context:
space:
mode:
authorInstrumental <jonathan.gathman@att.com>2018-07-13 15:49:26 -0500
committerInstrumental <jonathan.gathman@att.com>2018-07-13 15:59:11 -0500
commit4ad4763d8c9191998cc671a884d1af5da6ba8bb9 (patch)
tree124d864d0c3e1e03015ecb70a960e434775a59ef /auth/sample/local
parent9af4623faed6fd0bda1567cbf28899b5b5363be0 (diff)
Make Container Config Strategy
Issue-ID: AAF-378 Change-Id: I57186f66b9713262643e0f440f5b9eb78154c155 Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'auth/sample/local')
-rw-r--r--auth/sample/local/.dockerignore1
-rw-r--r--auth/sample/local/.gitignore2
-rw-r--r--auth/sample/local/aaf.props6
-rw-r--r--auth/sample/local/org.osaaf.aaf.cassandra.props2
-rw-r--r--auth/sample/local/org.osaaf.aaf.cm.ca.props6
5 files changed, 10 insertions, 7 deletions
diff --git a/auth/sample/local/.dockerignore b/auth/sample/local/.dockerignore
new file mode 100644
index 00000000..6c7b69a0
--- /dev/null
+++ b/auth/sample/local/.dockerignore
@@ -0,0 +1 @@
+.gitignore
diff --git a/auth/sample/local/.gitignore b/auth/sample/local/.gitignore
index 362863ac..e69de29b 100644
--- a/auth/sample/local/.gitignore
+++ b/auth/sample/local/.gitignore
@@ -1,2 +0,0 @@
-truststoreONAPall.jks
-org.osaaf.aaf.signer.p12
diff --git a/auth/sample/local/aaf.props b/auth/sample/local/aaf.props
index 6b08d9a0..8237c4e9 100644
--- a/auth/sample/local/aaf.props
+++ b/auth/sample/local/aaf.props
@@ -10,9 +10,13 @@ aaf_domain_support=.com:.org
aaf_default_realm=people.osaaf.org
# Initial Passwords and such
-aaf_password=osaaf_admin
+aaf_password=startup
+cadi_alias=osaaf@aaf.osaaf.org
+cadi_keystore=/opt/app/osaaf/local/org.osaaf.aaf.p12
+cadi_keystore_password=kumquat
cadi_truststore=/opt/app/osaaf/public/truststoreONAPall.jks
cadi_truststore_password=changeit
# Other
aaf_data_dir=/opt/app/osaaf/data
+cadi_registration_hostname=meriadoc.mithril.sbc.com
diff --git a/auth/sample/local/org.osaaf.aaf.cassandra.props b/auth/sample/local/org.osaaf.aaf.cassandra.props
index 692e57f9..9e29d834 100644
--- a/auth/sample/local/org.osaaf.aaf.cassandra.props
+++ b/auth/sample/local/org.osaaf.aaf.cassandra.props
@@ -7,7 +7,7 @@ cassandra.clusters=cass.aaf.osaaf.org
cassandra.clusters.port=9042
#need this to be fully qualified name when REAL AAF integration
cassandra.clusters.user=cassandra
-cassandra.clusters.password=enc:<Encrypted Password>
+cassandra.clusters.password=enc:
# Name for exception that has happened in the past
cassandra.reset.exceptions=com.datastax.driver.core.exceptions.NoHostAvailableException:"no host was tried":"Connection has been closed"
diff --git a/auth/sample/local/org.osaaf.aaf.cm.ca.props b/auth/sample/local/org.osaaf.aaf.cm.ca.props
index 59242995..92d55f92 100644
--- a/auth/sample/local/org.osaaf.aaf.cm.ca.props
+++ b/auth/sample/local/org.osaaf.aaf.cm.ca.props
@@ -1,10 +1,10 @@
##
-## org.osaaf.aaf.cm.ca.props
-## Properties to access Certificate Authority
+## org.osaaf.cm.ca.props
+## Properties to access Certifiate Authority
##
#Certman
-cm_ca.local=org.onap.aaf.auth.cm.ca.LocalCA,/opt/app/osaaf/local/org.osaaf.aaf.cm.p12;aaf_cm_ca;enc:<Encrypted Password>
+cm_ca.local=org.onap.aaf.auth.cm.ca.LocalCA,/opt/app/osaaf/local/aaf_intermediate_1.p12;aaf_intermediate_1;enc:
cm_ca.local.idDomains=org.osaaf
cm_ca.local.baseSubject=/OU=OSAAF/O=ONAP/C=US
cm_ca.local.perm_type=org.osaaf.aaf.ca