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

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 (file)
index 08f6cda..0000000
Binary files a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/keystore and /dev/null 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 (file)
index 0000000..ee000dc
Binary files /dev/null and b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/org.onap.sdc.p12 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 3bb482d..8358e28 100644 (file)
--- 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 8a0f6a7..4f7e710 100644 (file)
--- 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