aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorr.bogacki <r.bogacki@samsung.com>2019-08-19 10:43:05 +0200
committerOfir Sonsino <ofir.sonsino@intl.att.com>2019-08-20 15:19:41 +0000
commit1e8b38324fc1a9f73285ce2b07b6945db528d208 (patch)
tree2640cea9f02fd4bdb28dc46cdd2303f6937027d5
parent7ddcf0ffa5470a0a0c1e0221f81cb0a4acf142c7 (diff)
HTTPS calls for webseal-simulator
Implemented HTTPS calls into webseal-simulator -Added p12 keystore certificate. -Updated application configuration. Issue-ID: SDC-2517 Signed-off-by: Robert Bogacki <r.bogacki@samsung.com> Change-Id: Ieb5f9ec5a0e409eb4bad36f708b2eec424ecf70b
-rw-r--r--utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/keystorebin1416 -> 0 bytes
-rw-r--r--utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/org.onap.sdc.p12bin0 -> 4051 bytes
-rw-r--r--utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_4_locate_keystore.rb6
-rw-r--r--utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_5_create_jetty_modules.rb4
4 files changed, 5 insertions, 5 deletions
diff --git a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/keystore b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/keystore
deleted file mode 100644
index 08f6cda8a7..0000000000
--- a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/keystore
+++ /dev/null
Binary files differ
diff --git a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/org.onap.sdc.p12 b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/org.onap.sdc.p12
new file mode 100644
index 0000000000..ee000dc749
--- /dev/null
+++ b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/org.onap.sdc.p12
Binary files differ
diff --git a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_4_locate_keystore.rb b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_4_locate_keystore.rb
index 3bb482d89a..8358e28339 100644
--- a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_4_locate_keystore.rb
+++ b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_4_locate_keystore.rb
@@ -8,9 +8,9 @@ directory "Jetty_etcdir_creation" do
action :create
end
-cookbook_file "/#{jetty_base}/etc/keystore" do
- source "keystore"
+cookbook_file "/#{jetty_base}/etc/org.onap.sdc.trust.jks" do
+ source "org.onap.sdc.trust.jks"
owner "jetty"
group "jetty"
mode 0755
-end \ No newline at end of file
+end
diff --git a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_5_create_jetty_modules.rb b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_5_create_jetty_modules.rb
index 8a0f6a79c2..4f7e710d63 100644
--- a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_5_create_jetty_modules.rb
+++ b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_5_create_jetty_modules.rb
@@ -18,8 +18,8 @@ template "ssl-ini" do
mode "0755"
variables({
:https_port => "8443",
- :jetty_keystore_pwd => "OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4",
- :jetty_keymanager_pwd => "OBF:1u2u1wml1z7s1z7a1wnl1u2g"
+ :jetty_keystore_pwd => "rTIS;B4kM]2GHcNK2c3B4&Ng",
+ :jetty_keymanager_pwd => "rTIS;B4kM]2GHcNK2c3B4&Ng"
})
end