From 1efda07f5d8e14d028fddf62dec62c95af9c7342 Mon Sep 17 00:00:00 2001 From: Instrumental Date: Tue, 24 Apr 2018 07:08:05 -0500 Subject: Adjust Props for Heat Issue-ID: AAF-256 Change-Id: I93557a108c7c693e96e7a939a22310c2ae1944c0 Signed-off-by: Instrumental --- auth/docker/drun.sh | 2 +- auth/sample/data/identities.dat | 1 + auth/sample/etc/org.osaaf.common.props | 4 ++-- auth/sample/local/org.osaaf.aaf.cm.p12 | Bin 0 -> 2818 bytes auth/sample/local/org.osaaf.aaf.p12 | Bin 3950 -> 3920 bytes auth/sample/local/org.osaaf.aaf.props | 17 +++++++++++++++++ auth/sample/local/org.osaaf.cm.ca.props | 2 +- auth/sample/local/org.osaaf.props | 17 ----------------- 8 files changed, 22 insertions(+), 21 deletions(-) create mode 100644 auth/sample/local/org.osaaf.aaf.cm.p12 create mode 100644 auth/sample/local/org.osaaf.aaf.props delete mode 100644 auth/sample/local/org.osaaf.props (limited to 'auth') diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh index b4c64d09..e9805887 100644 --- a/auth/docker/drun.sh +++ b/auth/docker/drun.sh @@ -41,7 +41,7 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do echo Starting aaf_$AAF_COMPONENT... docker run \ - -i \ + -d \ --name aaf_$AAF_COMPONENT \ --hostname="${AAF_COMPONENT}.aaf.osaaf.org" \ --add-host="$HOSTNAME:$HOST_IP" \ diff --git a/auth/sample/data/identities.dat b/auth/sample/data/identities.dat index 93bfcdb3..fdd704bc 100644 --- a/auth/sample/data/identities.dat +++ b/auth/sample/data/identities.dat @@ -24,6 +24,7 @@ ian|Ian Howell|Ian|Howell|314-450-2782|ian.howell@att.com|e|jonathan gabe|Gabe B Maurer|Gabe|Maurer|314-962-9579|gabe.maurer@att.com|e|jonathan sai|Sai Gandham|Sai|Gandham|424-265-9959|sai.gandham@att.com|c|anne anne|Anne E Kopp|Anne|Kopp|512-244-4280|anne.e.kopp@att.com|e|jonathan +aaf|AAF App|AAF|Application||DL-aaf-support@att.com|a|jonathan a2345z|AAF App|AAF|Application||DL-aaf-support@att.com|a|jonathan aaf_authz|AAF App|AAF|Application||jonathan.gathman@att.com|a|jonathan kirankamieni|Kiran K Kamineni|Kiran|Kamineni|999-999=9999|kiran.k.kamineni@intel.com|ramkoya diff --git a/auth/sample/etc/org.osaaf.common.props b/auth/sample/etc/org.osaaf.common.props index e1477468..459d7d7c 100644 --- a/auth/sample/etc/org.osaaf.common.props +++ b/auth/sample/etc/org.osaaf.common.props @@ -6,10 +6,10 @@ aaf_root_ns=org.osaaf.aaf aaf_trust_perm=org.osaaf.aaf|org.onap|trust -cadi_prop_files=/opt/app/osaaf/local/org.osaaf.location.props:/opt/app/osaaf/local/org.osaaf.props +cadi_prop_files=/opt/app/osaaf/local/org.osaaf.location.props:/opt/app/osaaf/local/org.osaaf.aaf.props cadi_protocols=TLSv1.1,TLSv1.2 -aaf_locate_url=https://aaf.osaaf.org +aaf_locate_url=https://aaf.osaaf.org:8095 aaf_url=https://AAF_LOCATE_URL/AAF_NS.service:2.0 cadi_loginpage_url=https://AAF_LOCATE_URL/AAF_NS.gui:2.0/login diff --git a/auth/sample/local/org.osaaf.aaf.cm.p12 b/auth/sample/local/org.osaaf.aaf.cm.p12 new file mode 100644 index 00000000..63aedd25 Binary files /dev/null and b/auth/sample/local/org.osaaf.aaf.cm.p12 differ diff --git a/auth/sample/local/org.osaaf.aaf.p12 b/auth/sample/local/org.osaaf.aaf.p12 index 08ed3be8..e4d33924 100644 Binary files a/auth/sample/local/org.osaaf.aaf.p12 and b/auth/sample/local/org.osaaf.aaf.p12 differ diff --git a/auth/sample/local/org.osaaf.aaf.props b/auth/sample/local/org.osaaf.aaf.props new file mode 100644 index 00000000..f5970b01 --- /dev/null +++ b/auth/sample/local/org.osaaf.aaf.props @@ -0,0 +1,17 @@ +############################################################ +# Properties Generated by AT&T Certificate Manager +# by jg1555 +# on 2018-02-21T10:28:08.909-0600 +# @copyright 2016, AT&T +############################################################ +cm_url=https://aaf.osaaf.org:8150 +#hostname=aaf.osaaf.org +aaf_env=DEV +cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US +cadi_keyfile=/opt/app/osaaf/local/org.osaaf.aaf.keyfile +cadi_keystore=/opt/app/osaaf/local/org.osaaf.aaf.p12 +cadi_keystore_password=enc:4L1xY_7mYTuk57SPWZetza5WlgBUYBe8pbT1-AWKO1-5PAbSTynQEc5TU7ZeomfN +#cadi_key_password=enc: +cadi_alias=aaf@aaf.osaaf.org +cadi_truststore=/opt/app/osaaf/local/org.osaaf.aaf.trust.p12 +cadi_truststore_password=enc:5nzj6v3Rb0oZPV1zCxg8EJFfkFvWFGJflLB0i_FN0Np diff --git a/auth/sample/local/org.osaaf.cm.ca.props b/auth/sample/local/org.osaaf.cm.ca.props index 5293f0bb..8843705c 100644 --- a/auth/sample/local/org.osaaf.cm.ca.props +++ b/auth/sample/local/org.osaaf.cm.ca.props @@ -4,7 +4,7 @@ ## #Certman -cm_ca.local=org.onap.aaf.auth.cm.ca.LocalCA,/opt/app/osaaf/local/intermediate_1.p12;intermediate_1;enc:kieWQoNgaIfCrdoqOTsjDQwIp8V1NM4mLgDW3X1g8oyOhBQ-aOmdo12kvL_AMs6u +cm_ca.local=org.onap.aaf.auth.cm.ca.LocalCA,/opt/app/osaaf/local/org.osaaf.aaf.cm.p12;aaf_cm_ca;enc:asFEWMNqjH7GktBLb9EGl6L1zfS2qMH5ZS5Zd90KVT5B9ZyRsqx7Gb73YllO8Hyw 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 diff --git a/auth/sample/local/org.osaaf.props b/auth/sample/local/org.osaaf.props deleted file mode 100644 index 5ae86c34..00000000 --- a/auth/sample/local/org.osaaf.props +++ /dev/null @@ -1,17 +0,0 @@ -############################################################ -# Properties Generated by AT&T Certificate Manager -# by jg1555 -# on 2018-02-21T10:28:08.909-0600 -# @copyright 2016, AT&T -############################################################ -cm_url=https://aaf.osaaf.org:8150 -#hostname=aaf.osaaf.org -aaf_env=DEV -cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US -cadi_keyfile=/opt/app/osaaf/local/org.osaaf.aaf.keyfile -cadi_keystore=/opt/app/osaaf/local/org.osaaf.aaf.p12 -cadi_keystore_password=enc:4L1xY_7mYTuk57SPWZetza5WlgBUYBe8pbT1-AWKO1-5PAbSTynQEc5TU7ZeomfN -#cadi_key_password=enc: -cadi_alias=a2345z@aaf.osaaf.org -cadi_truststore=/opt/app/osaaf/local/org.osaaf.aaf.trust.p12 -cadi_truststore_password=enc:5nzj6v3Rb0oZPV1zCxg8EJFfkFvWFGJflLB0i_FN0Np -- cgit 1.2.3-korg