diff options
author | k.kedron <k.kedron@partner.samsung.com> | 2019-08-28 14:31:52 +0200 |
---|---|---|
committer | Ofir Sonsino <ofir.sonsino@intl.att.com> | 2019-08-30 07:46:34 +0000 |
commit | 64636c2148414c1fa5da4b46a69570cdab003837 (patch) | |
tree | ada4dc163443427420217de5e716b532329ff255 /docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/recipes/jetty_setup.rb | |
parent | 5a4e1827b867a2de46c14f32449b37d0ff60d1fd (diff) |
Fully HTTPS support in the dcaedt-be
Fully HTTPS support:
-Updated the onap/base_sdc-jetty docker image version
-Updated the chef script to properly used of the new docker image
-Updated jvm configuration to support call to
the SDC components using HTTPS.
-Add support for change the http to https in the python script
-Added buildRestClient method to create the CloseableHttpClient
supporting the SSL connection
-Checkstyle in the recipes
-Update the docker_run.sh:
- Change JAVA_OPTIONS
- Used the secure connection to do health check
Issue-ID: SDC-2477
Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com>
Change-Id: I7bf3d307e5765fa75a37ba0a4b41fd7fa87d28ab
Diffstat (limited to 'docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/recipes/jetty_setup.rb')
-rw-r--r-- | docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/recipes/jetty_setup.rb | 86 |
1 files changed, 0 insertions, 86 deletions
diff --git a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/recipes/jetty_setup.rb b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/recipes/jetty_setup.rb deleted file mode 100644 index 43919ed..0000000 --- a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/recipes/jetty_setup.rb +++ /dev/null @@ -1,86 +0,0 @@ -jetty_base = "#{node['JETTY_BASE']}" -jetty_home = "#{node['JETTY_HOME']}" - -#Set the http module option -if node['disableHttp'] - http_option = "#--module=http" -else - http_option = "--module=http" -end - - -printf("DEBUG: [%s]:[%s] disableHttp=[%s], http_option=[%s] !!! \n", cookbook_name, recipe_name, node['disableHttp'], http_option ) - - -directory "Jetty_etcdir_creation" do - path "/#{jetty_base}/etc" - owner 'jetty' - group 'jetty' - mode '0755' - action :create -end - - -# Create Keystore -cookbook_file "/#{jetty_base}/etc/org.onap.sdc.p12" do - source "org.onap.sdc.p12" - owner "jetty" - group "jetty" - mode 0755 -end - -# Create Truststore -cookbook_file "/#{jetty_base}/etc/org.onap.sdc.trust.jks" do - source "org.onap.sdc.trust.jks" - owner "jetty" - group "jetty" - mode 0755 -end - -bash "create-jetty-modules" do - cwd "#{jetty_base}" - code <<-EOH - cd "#{jetty_base}" - java -jar "/#{jetty_home}"/start.jar --add-to-start=deploy - java -jar "/#{jetty_home}"/start.jar --add-to-startd=http,https,logging,setuid - EOH -end - -# configure Jetty modules -template "http-ini" do - path "/#{jetty_base}/start.d/http.ini" - source "http-ini.erb" - owner "jetty" - group "jetty" - mode "0755" - variables ({ - :http_option => http_option , - :http_port => "#{node['DCAE']['BE'][:http_port]}" - }) -end - -template "https-ini" do - path "/#{jetty_base}/start.d/https.ini" - source "https-ini.erb" - owner "jetty" - group "jetty" - mode "0755" - variables ({ - :https_port => "#{node['DCAE']['BE'][:https_port]}" - }) -end - -template "ssl-ini" do - path "/#{jetty_base}/start.d/ssl.ini" - source "ssl-ini.erb" - owner "jetty" - group "jetty" - mode "0755" - variables ({ - :https_port => "#{node['DCAE']['BE'][:https_port]}" , - :jetty_keystore_pwd => "#{node['jetty'][:keystore_pwd]}" , - :jetty_keymanager_pwd => "#{node['jetty'][:keymanager_pwd]}" , - :jetty_truststore_pwd => "#{node['jetty'][:truststore_pwd]}" - }) -end - |