From 6e60006d2e22665b491d176ca9e91b74326bfabc Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Mon, 19 Jun 2017 19:51:24 +0300 Subject: [sdc] update to the current code base and support http Change-Id: I2fb35494b40126a8395b1e309a180db4127754b7 Signed-off-by: Michael Lando --- .../cookbooks/sdc-catalog-be/recipes/BE_4_setup_configuration.rb | 4 +++- .../templates/default/BE-distribution-engine-configuration.yaml.erb | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'sdc-os-chef/sdc-backend') 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 2c4a786d34..44c9f2d454 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 @@ -19,6 +19,7 @@ end template "catalog-be-config" do path "/var/lib/jetty/config/catalog-be/configuration.yaml" source "BE-configuration.yaml.erb" + cookbook "sdc-os-common" owner "jetty" group "jetty" mode "0755" @@ -28,7 +29,8 @@ template "catalog-be-config" do :ssl_port => node['BE'][:https_port], :cassandra_ip => node['Nodes']['CS'], :rep_factor => 1, - :DC_NAME => node['cassandra'][:cluster_name]+node.chef_environment + :DC_NAME => node['cassandra'][:cluster_name]+node.chef_environment, + :titan_Path => "/var/lib/jetty/config/catalog-be/" }) end diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-distribution-engine-configuration.yaml.erb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-distribution-engine-configuration.yaml.erb index e71f6a9e23..7972d746ab 100644 --- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-distribution-engine-configuration.yaml.erb +++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-distribution-engine-configuration.yaml.erb @@ -42,3 +42,5 @@ createTopic: startDistributionEngine: true +#This is false by default, since ONAP Dmaap currently doesn't support https +useHttpsWithDmaap: false \ No newline at end of file -- cgit 1.2.3-korg