From 503be6d4ac7cfd63d5e17a54bd990de39b201d83 Mon Sep 17 00:00:00 2001 From: Tal Gitelman Date: Wed, 5 Sep 2018 17:47:16 +0300 Subject: add ability to disable tenant isolation. Change-Id: I35b6db5ec0d3aa91295f57b60c04243b3f3d2208 Issue-ID: SDC-1571 Signed-off-by: Tal Gitelman --- .../chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb | 3 +++ .../cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb | 3 ++- .../sdc-catalog-be/templates/default/BE-configuration.yaml.erb | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) (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/attributes/default.rb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb index 14d3bdff95..49ac86aaec 100644 --- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb +++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb @@ -33,3 +33,6 @@ default['UEB']['PublicKey'] = "sSJc5qiBnKy2qrlc" default['UEB']['SecretKey'] = "4ZRPzNJfEUK0sSNBvccd2m7X" default['Pair_EnvName'] = "" + +#DmaapConsumer +default['DMAAP']['active'] = false \ No newline at end of file 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 155ea24077..74d867d699 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 @@ -61,7 +61,8 @@ template "catalog-be-config" do :cassandra_usr => node['cassandra'][:cassandra_user], :cassandra_truststore_password => node['cassandra'][:truststore_password], :cassandra_ssl_enabled => "#{ENV['cassandra_ssl_enabled']}", - :dcae_be_vip => node['DCAE_BE_VIP'] + :dcae_be_vip => node['DCAE_BE_VIP'], + :dmaap_active => node['DMAAP']['active'] }) end diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb index af1e5fadf7..c7710c503e 100644 --- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb +++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb @@ -668,6 +668,7 @@ environmentContext: - General_Non-Revenue dmaapConsumerConfiguration: + active: <%= @dmaap_active %> hosts: localhost:3905 consumerGroup: sdc consumerId: mama -- cgit 1.2.3-korg