From ba229230144f00d35d55e31a80ca2576bd831448 Mon Sep 17 00:00:00 2001 From: Tal Gitelman Date: Mon, 7 Aug 2017 17:59:54 +0300 Subject: [SDC] sync Change-Id: I150c22c816c52cc142e8d0f3c92e5df7ecea4e3c Signed-off-by: Tal Gitelman --- .../sdc-catalog-be/recipes/BE_1_cleanup_jettydir.rb | 9 --------- .../sdc-catalog-be/recipes/BE_4_setup_configuration.rb | 14 -------------- 2 files changed, 23 deletions(-) (limited to 'sdc-os-chef/sdc-backend') diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_1_cleanup_jettydir.rb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_1_cleanup_jettydir.rb index 70e4bd06fb..d989eb20bb 100644 --- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_1_cleanup_jettydir.rb +++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_1_cleanup_jettydir.rb @@ -46,12 +46,3 @@ directory "BE_create_catalog-be" do mode '0755' action :create end - - -directory "BE_create_catalog-be" do - path "/var/lib/jetty/config/onboarding-be" - owner 'jetty' - group 'jetty' - mode '0755' - action :create -end \ No newline at end of file diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_setup_configuration.rb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_setup_configuration.rb index 2dd430ce7a..d76e95de1d 100644 --- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_setup_configuration.rb +++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_setup_configuration.rb @@ -53,20 +53,6 @@ cookbook_file "ArtifactGenerator" do end -template "onboarding-be-config" do - path "/#{jetty_base}/config/onboarding-be/onboarding_configuration.yaml" - source "BE-onboarding-configuration.yaml.erb" - owner "m98835" - group "mechid" - mode "0755" - variables({ - :catalog_ip => node['HOST_IP'], - :catalog_port => node['BE'][:http_port], - :ssl_port => node['BE'][:https_port] -}) -end - - cookbook_file "/#{jetty_base}/etc/keystore" do source "keystore" owner "jetty" -- cgit 1.2.3-korg