From 249b2c06fb63e42efcfbb1a2c60004789b4f9c8d Mon Sep 17 00:00:00 2001 From: Hector Anapan Date: Wed, 16 Aug 2017 14:56:54 -0400 Subject: Changing AAIService Bundle to use AAI Properties This code changes the docker-compose.yml's SDNC_CONFIG_DIR env.variable in the "appc" service that deploys the appc container to point to appc's aaiclient.properties instead of the sdnc's aiiclient.properties. In doing so, some properties had to be moved to the new SDNC_CONFIG_DIR's appc properties folder path so SDNC karaf features are installed correctly. Also, replacing the AAIClient p12 keystore by converting the validated jks file to this new p12 keystore certificate. Change-Id: I6ee5bd56f4403cb575fdc93ded8eebc6a7a5cc4b Signed-off-by: Hector Anapan Issue: [APPC-129] --- .../src/main/properties/mdsal-resource.properties | 25 ++++++++++++++++++ .../src/main/properties/sql-resource.properties | 21 ++++++++++++++++ .../src/main/properties/svclogic.properties | 28 +++++++++++++++++++++ installation/src/main/stores/keystore.client.p12 | Bin 5652 -> 0 bytes .../src/main/stores/keystore.clientnew.p12 | Bin 0 -> 3488 bytes 5 files changed, 74 insertions(+) create mode 100644 installation/src/main/properties/mdsal-resource.properties create mode 100644 installation/src/main/properties/sql-resource.properties create mode 100644 installation/src/main/properties/svclogic.properties delete mode 100644 installation/src/main/stores/keystore.client.p12 create mode 100644 installation/src/main/stores/keystore.clientnew.p12 (limited to 'installation/src') diff --git a/installation/src/main/properties/mdsal-resource.properties b/installation/src/main/properties/mdsal-resource.properties new file mode 100644 index 0000000..7f015f4 --- /dev/null +++ b/installation/src/main/properties/mdsal-resource.properties @@ -0,0 +1,25 @@ +### +# ============LICENSE_START======================================================= +# APPC +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= +### + +org.openecomp.sdnc.sli.resource.mdsal.sdnc-user=admin +org.openecomp.sdnc.sli.resource.mdsal.sdnc-passwd=admin +org.openecomp.sdnc.sli.resource.mdsal.sdnc-host=localhost +org.openecomp.sdnc.sli.resource.mdsal.sdnc-protocol=http +org.openecomp.sdnc.sli.resource.mdsal.sdnc-port=8181 diff --git a/installation/src/main/properties/sql-resource.properties b/installation/src/main/properties/sql-resource.properties new file mode 100644 index 0000000..e1f4e38 --- /dev/null +++ b/installation/src/main/properties/sql-resource.properties @@ -0,0 +1,21 @@ +### +# ============LICENSE_START======================================================= +# APPC +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= +### + +org.openecomp.sdnc.resource.sql.cryptkey=QtfJMKggVk diff --git a/installation/src/main/properties/svclogic.properties b/installation/src/main/properties/svclogic.properties new file mode 100644 index 0000000..83ebae9 --- /dev/null +++ b/installation/src/main/properties/svclogic.properties @@ -0,0 +1,28 @@ +### +# ============LICENSE_START======================================================= +# APPC +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= +### + +org.openecomp.sdnc.sli.dbtype = dblib +#Note : the next 4 fields are only used if org.openecomp.sdnc.sli.dbtype = jdbc +org.openecomp.sdnc.sli.jdbc.url=jdbc:mysql://dbhost:3306/sdnctl +org.openecomp.sdnc.sli.jdbc.database=sdnctl +org.openecomp.sdnc.sli.jdbc.user=sdnctl +org.openecomp.sdnc.sli.jdbc.password=gamma + +org.xml.sax.driver=org.apache.xerces.parsers.SAXParser diff --git a/installation/src/main/stores/keystore.client.p12 b/installation/src/main/stores/keystore.client.p12 deleted file mode 100644 index 5efffb3..0000000 Binary files a/installation/src/main/stores/keystore.client.p12 and /dev/null differ diff --git a/installation/src/main/stores/keystore.clientnew.p12 b/installation/src/main/stores/keystore.clientnew.p12 new file mode 100644 index 0000000..932889e Binary files /dev/null and b/installation/src/main/stores/keystore.clientnew.p12 differ -- cgit 1.2.3-korg