summaryrefslogtreecommitdiffstats
path: root/catalog-be/src/main
diff options
context:
space:
mode:
authorMichaelMorris <michael.morris@est.tech>2020-03-10 12:37:48 +0000
committerOfir Sonsino <ofir.sonsino@intl.att.com>2020-03-16 08:45:37 +0000
commit69ba31d1ea0b20c19df0e462a5bbb4b67097146a (patch)
tree99e5512aef2fb147fc3a7accbb72b7288e3255be /catalog-be/src/main
parent9272b75cc0d70645de21885b98200c1b9684dac9 (diff)
Run pods as non-root user
Summary of changes: sdc-cassandra-init Added user sdc (in base image base_sdc-cqlsh - https://gerrit.onap.org/r/103436) Run entrypoint as user sdc Moved relevant files from /root/ to /home/sdc/ sdc-backend-init Added user sdc (in base image base_sdc-python - https://gerrit.onap.org/r/103436) Run entrypoint as user sdc Moved relevant files from /root/ to /home/sdc/ sdc-backend Run entrypoint as user jetty Moved relevant files from /root/ to /var/lib/jetty/ Moved cadi & cert files from /opt/app/jetty to /var/lib/jetty/ Moved ready_probe from /var/lib/read-probe.sh to /var/lib/jetty/read-probe.sh sdc-frontend Run entrypoint as user jetty Moved relevant files from /root/ to /var/lib/jetty/ Moved ready_probe from /var/lib/read-probe.sh to /var/lib/jetty/read-probe.sh sdc-onboard-backend-docker Run entrypoint as user jetty Moved relevant files from /root/ to /var/lib/jetty/ Moved ready_probe from /var/lib/read-probe.sh to /var/lib/jetty/read-probe.sh sdc-onboard-db-init-docker Run entrypoint as user sdc Added user sdc (in base image base_sdc-cqlsh - https://gerrit.onap.org/r/103436) Moved relevant files from /root/ to /home/sdc/ Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-2798 Change-Id: I85be320a4a5e1cc5aeebbb98c4484d5d6fd06dfc (cherry picked from commit a2abf6ea18d512d367277bacaf7476754dc0eff5)
Diffstat (limited to 'catalog-be/src/main')
-rw-r--r--catalog-be/src/main/resources/cadi.properties6
-rw-r--r--catalog-be/src/main/resources/config/configuration.yaml12
-rw-r--r--catalog-be/src/main/resources/config/distribution-engine-configuration.yaml2
3 files changed, 10 insertions, 10 deletions
diff --git a/catalog-be/src/main/resources/cadi.properties b/catalog-be/src/main/resources/cadi.properties
index 0d6aee1d99..bbce36124d 100644
--- a/catalog-be/src/main/resources/cadi.properties
+++ b/catalog-be/src/main/resources/cadi.properties
@@ -13,7 +13,7 @@ hostname=onapportal
csp_domain=PROD
# Add Absolute path to Keyfile
-cadi_keyfile=/opt/app/jetty/base/be/etc/keyfile
+cadi_keyfile=/var/lib/jetty/opt/be/etc/keyfile
# This is required to accept Certificate Authentication from Certman certificates.
@@ -31,7 +31,7 @@ cadi_loglevel=DEBUG
# Default TrustStore - REQUIRED for changing PROTOCOL Defaults for DME2
# Read https://wiki.web.att.com/pages/viewpage.action?pageId=574623569#URGENT:SolvingSSL2-3/TLSv1removalissues-Up-to-dateTruststore
# Add Absolute path to truststore2018.jks
-cadi_truststore=/opt/app/jetty/base/be/etc/cadi_truststore.jks
+cadi_truststore=/var/lib/jetty/base/be/etc/cadi_truststore.jks
# Note: This is the ONLY password that doesn't have to be encrypted. All Java's TrustStores are this passcode by default, because they are public certs
cadi_truststore_password=changeit
@@ -52,4 +52,4 @@ cadi_latitude=32.780140
cadi_longitude=-96.800451
aaf_root_ns=com.att.aaf
-aaf_api_version=2.0 \ No newline at end of file
+aaf_api_version=2.0
diff --git a/catalog-be/src/main/resources/config/configuration.yaml b/catalog-be/src/main/resources/config/configuration.yaml
index 482bea1906..8dfe646629 100644
--- a/catalog-be/src/main/resources/config/configuration.yaml
+++ b/catalog-be/src/main/resources/config/configuration.yaml
@@ -111,7 +111,7 @@ cassandraConfig:
username: asdc_user
password: Aa1234%^!
ssl: true
- truststorePath : /opt/app/jetty/base/be/config/.truststore
+ truststorePath : /var/lib/jetty/opt/base/be/config/.truststore
truststorePassword : Aa123456
keySpaces:
- { name: dox, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['DC-sdc-iltlv650', '1']}
@@ -816,7 +816,7 @@ dmaapConsumerConfiguration:
password: XyCUPhFx9u70aklYGo6OiA==
aftDme2SslEnable: true
aftDme2ClientIgnoreSslConfig: false
- aftDme2ClientKeystore: /opt/app/jetty/base/be/config/.truststore
+ aftDme2ClientKeystore: /var/lib/jetty/opt/base/be/config/.truststore
aftDme2ClientKeystorePassword: XyCUPhFx9u70aklYGo6OiA==
aftDme2ClientSslCertAlias: certman
@@ -850,7 +850,7 @@ dmaapProducerConfiguration:
password: XyCUPhFx9u70aklYGo6OiA==
aftDme2SslEnable: true
aftDme2ClientIgnoreSslConfig: false
- aftDme2ClientKeystore: /opt/app/jetty/base/be/config/.truststore
+ aftDme2ClientKeystore: /var/lib/jetty/opt/jetty/base/be/config/.truststore
aftDme2ClientKeystorePassword: XyCUPhFx9u70aklYGo6OiA==
aftDme2ClientSslCertAlias: certman
@@ -901,9 +901,9 @@ aafAuthNeeded: false
cadiFilterParams:
hostname: 192.168.33.10
csp_domain: PROD
- cadi_keyfile: /opt/app/jetty/base/be/config/catalog-be/keyfile
+ cadi_keyfile: /var/lib/jetty/opt/base/be/config/catalog-be/keyfile
cadi_loglevel: DEBUG
- cadi_truststore: /opt/app/jetty/base/be/config/.truststore
+ cadi_truststore: /var/lib/jetty/opt/base/be/config/.truststore
cadi_truststore_password: enc:XyCUPhFx9u70aklYGo6OiA==
#aaf_url: https://aaf.onap.org/service=?
aaf_id: aaf@sdc.onap.org
@@ -918,4 +918,4 @@ cadiFilterParams:
# This configuration entry lists all node type names prefix that shall be allowed on SDC.
definedResourceNamespace:
- - org.openecomp.resource. \ No newline at end of file
+ - org.openecomp.resource.
diff --git a/catalog-be/src/main/resources/config/distribution-engine-configuration.yaml b/catalog-be/src/main/resources/config/distribution-engine-configuration.yaml
index 1817ecbb2b..65a41e448e 100644
--- a/catalog-be/src/main/resources/config/distribution-engine-configuration.yaml
+++ b/catalog-be/src/main/resources/config/distribution-engine-configuration.yaml
@@ -61,7 +61,7 @@ aaiConfig:
readTimeoutMs: 5000
connectTimeoutMs: 1000
clientCertificate:
- keyStore: /opt/app/jetty/base/be/etc/non-prod.jks
+ keyStore: /var/lib/jetty/opt/base/be/etc/non-prod.jks
keyStorePassword: hmXYcznAljMSisdy8zgcag==
headers:
X-FromAppId: asdc