diff options
| author |   sebdet <sebastien.determe@intl.att.com> | 2020-09-21 22:13:05 +0200 |
|---|---|---|
| committer |   Michael Morris <michael.morris@est.tech> | 2021-05-12 10:27:10 +0000 |
| commit | df353be353e1ec25ac2a0e64a9eb617dcbc87703 (patch) | |
| tree | e79c636bc4f67bdd8392b24c85f2f6cb26e3c67a /catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb | |
| parent | 936781153118364e60662529dbd7217416a26148 (diff) | |
Use integration-java11 Dockerfile
Use onap/integration-java11:7.1.0 as a source for the images requiring JDK 11 in SDC
Issue-ID: SDC-3298
Change-Id: Ifee3d2942dcb9c078f2ebb686bdabc0ecca857b3
Signed-off-by: xuegao <xue.gao@intl.att.com>
Diffstat (limited to 'catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb')
| -rw-r--r-- | catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb index 528ddae9ad..dc7d77b0ab 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb +++ b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb @@ -13,8 +13,9 @@ default['disableHttp'] = true #+----------------------------------+ default['jetty']['dmaap_truststore_pwd'] = "dmaap_truststore_pwd" -default['jetty'][:keystore_pwd] = "?(kP!Yur![*!Y5!E^f(ZKc31" -default['jetty'][:keymanager_pwd] = "?(kP!Yur![*!Y5!E^f(ZKc31" +default['jetty']['keystore_pwd'] = "?(kP!Yur![*!Y5!E^f(ZKc31" +default['jetty']['keymanager_pwd'] = "?(kP!Yur![*!Y5!E^f(ZKc31" +default['jetty']['truststore_path'] = "#{ENV['JETTY_BASE']}/etc/truststore" # TO CHANGE THE TRUSTSTORE CERT THE JVM CONFIGURATION # MUST BE ALSO CHANGE IN THE startup.sh FILE default['jetty'][:truststore_pwd] = "z+KEj;t+,KN^iimSiS89e#p0" @@ -33,6 +34,7 @@ default['cassandra']['socket_read_timeout'] = 20000 default['cassandra']['socket_connect_timeout'] = 20000 default['cassandra']['janusgraph_connection_timeout'] = 10000 default['cassandra'][:truststore_password] = "Aa123456" +default['cassandra']['janusgraph_config_file'] = "#{ENV['JETTY_BASE']}/config/catalog-be/janusgraph.properties" #Onboard @@ -86,10 +88,10 @@ default['DMAAP']['replicationcount'] = "3" #+----------------------------------+ # Cadi -default['access_restriction']['cadi_root_dir'] = "/var/lib/jetty/etc" -default['access_restriction']['cadi_keyfile'] = "/var/lib/jetty/etc/org.onap.sdc.p12" +default['access_restriction']['cadi_root_dir'] = "#{ENV['JETTY_BASE']}/etc" +default['access_restriction']['cadi_keyfile'] = "#{ENV['JETTY_BASE']}/etc/org.onap.sdc.p12" default['access_restriction']['cadi_loglevel'] = "DEBUG" -default['access_restriction']['cadi_truststore'] = "/var/lib/jetty/etc/org.onap.sdc.trust.jks" +default['access_restriction']['cadi_truststore'] = "#{ENV['JETTY_BASE']}/etc/org.onap.sdc.trust.jks" default['access_restriction']['cadi_truststore_password'] = "changeit" default['access_restriction']['cadiX509Issuers'] = "CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US" default['access_restriction']['encrypted_password'] = "enc:AccessRestrictionEncryptedPassword" |