From 01630f7047201e028e81d402bfdda31173b85fe0 Mon Sep 17 00:00:00 2001 From: vasraz Date: Thu, 28 May 2020 11:44:09 +0100 Subject: Support setting SDC-BE configuration at deployment time Change-Id: I4b384bc911630d6041a0c5c235d3aaf3ac148090 Signed-off-by: Vasyl Razinkov Issue-ID: SDC-3076 --- .../cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb | 8 +++++--- .../chef-repo/cookbooks/sdc-catalog-be/recipes/BE_7_logback.rb | 3 ++- .../cookbooks/sdc-catalog-be/recipes/BE_8_errors_config.rb | 6 ++++-- 3 files changed, 11 insertions(+), 6 deletions(-) (limited to 'catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be') diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb index ab63712f97..2e66e2da98 100644 --- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb +++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb @@ -19,7 +19,8 @@ template "janusgraph.properties" do source "BE-janusgraph.properties.erb" owner "jetty" group "jetty" - mode "0755" + mode "0644" + action :create_if_missing variables({ :cassandra_ip => node['Nodes']['CS'].join(",").gsub(/[|]/, ''), :cassandra_cql_port => node['cassandra'][:cassandra_port], @@ -39,7 +40,7 @@ template "catalog-be-config" do source "BE-configuration.yaml.erb" owner "jetty" group "jetty" - mode "0755" + mode "0644" action :create_if_missing variables({ :catalog_ip => node['Nodes']['BE'], @@ -67,5 +68,6 @@ template "distribution-engine-configuration" do source "BE-distribution-engine-configuration.yaml.erb" owner "jetty" group "jetty" - mode "0755" + mode "0644" + action :create_if_missing end diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_7_logback.rb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_7_logback.rb index f5bf61725a..7d95d7448e 100644 --- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_7_logback.rb +++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_7_logback.rb @@ -1,7 +1,8 @@ cookbook_file "#{ENV['JETTY_BASE']}/config/catalog-be/logback.xml" do source "logback.xml" - mode 0755 + mode 0644 owner "jetty" group "jetty" + action :create_if_missing end diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_8_errors_config.rb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_8_errors_config.rb index 49cf3c3d1a..b100356d98 100644 --- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_8_errors_config.rb +++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_8_errors_config.rb @@ -1,14 +1,16 @@ cookbook_file "#{ENV['JETTY_BASE']}/config/catalog-be/ecomp-error-configuration.yaml" do source "ecomp-error-configuration.yaml" - mode 0755 + mode 0644 owner "jetty" group "jetty" + action :create_if_missing end cookbook_file "#{ENV['JETTY_BASE']}/config/catalog-be/error-configuration.yaml" do source "error-configuration.yaml" - mode 0755 + mode 0644 owner "jetty" group "jetty" + action :create_if_missing end -- cgit 1.2.3-korg