Adjust Props for Heat

Issue-ID: AAF-256
Change-Id: I93557a108c7c693e96e7a939a22310c2ae1944c0
Signed-off-by: Instrumental <jcgmisc@stl.gathman.org>

diff --git a/auth-client/pom.xml b/auth-client/pom.xml
index bb4b519..9f0bef7 100644 (file)
--- a/auth-client/pom.xml
+++ b/auth-client/pom.xml
@@ -28,12 +28,9 @@
         <version>2.1.0-SNAPSHOT</version>
     </parent>
        
-       <!-- No Parent on Purpose!!! -->
        <artifactId>aaf-auth-client</artifactId>
        <name>AAF Auth Client</name>
        <description>XSD Generated classes for AAF Auth</description>
-       <groupId>org.onap.aaf.authz</groupId>
-       <version>2.1.0-SNAPSHOT</version>
        <packaging>jar</packaging>
 
        <properties>

diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh
index b4c64d0..e980588 100644 (file)
--- 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 93bfcdb..fdd704b 100644 (file)
--- 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 e147746..459d7d7 100644 (file)
--- 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 (file)
index 0000000..63aedd2
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 08ed3be..e4d3392 100644 (file)
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.props b/auth/sample/local/org.osaaf.aaf.props
similarity index 96%
rename from auth/sample/local/org.osaaf.props
rename to auth/sample/local/org.osaaf.aaf.props
index 5ae86c3..f5970b0 100644 (file)
--- a/auth/sample/local/org.osaaf.props
+++ b/auth/sample/local/org.osaaf.aaf.props
@@ -12,6 +12,6 @@ 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:<KEY PASSWORD (optional if the same as KEYSTORE PASSWORD)>
-cadi_alias=a2345z@aaf.osaaf.org
+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 5293f0b..8843705 100644 (file)
--- 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/pom.xml b/pom.xml
index 1995045..58871f8 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -139,7 +139,7 @@
                </plugins>
        </build>
        <modules>
-               <!-- <module>auth-client</module>  -->
+               <module>auth-client</module>
                <module>misc</module>
                <module>cadi</module>
                <module>auth</module>