diff options
| author |   Tal Gitelman <tal.gitelman@att.com> | 2019-03-28 11:00:54 +0200 |
|---|---|---|
| committer | Tal Gitelman <tal.gitelman@att.com> | 2019-04-04 16:33:03 +0300 |
| commit | c4d387d216e72911f80c1ebee91b73aba191b91b (patch) | |
| tree | c12066b7a213d34ca7c84375fb4bb2d6f0b23138 /catalog-be | |
| parent | ac3aca69dbeae29c9aeca2053adc7aedbb75e149 (diff) | |
Make Cassandra port configurable.
SDC-BE & Onboarding - BE.
Reviewer: Evgenia A & Areli F.
Change-Id: Iaf86d647b0560764ef65d9148c85bffaf934992d
Issue-ID: SDC-2077
Signed-off-by: Tal Gitelman <tal.gitelman@att.com>
Diffstat (limited to 'catalog-be')
5 files changed, 5 insertions, 0 deletions
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 54f7128aa2..09c5cb3974 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 @@ -15,6 +15,7 @@ default['DCAE']['BE'][:https_port] = 8444 default['DCAE_BE_VIP'] = "dcae-be" #Cassandra +default['cassandra']['cassandra_port'] = 9042 default['cassandra']['datacenter_name'] = "DC-" default['cassandra']['cluster_name'] = "SDC-CS-" default['cassandra']['socket_read_timeout'] = 20000 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 74d867d699..335271f4d5 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 @@ -51,6 +51,7 @@ template "catalog-be-config" do :catalog_port => node['BE'][:http_port], :ssl_port => node['BE'][:https_port], :cassandra_ip => node['Nodes']['CS'].join(",").gsub(/[|]/,''), + :cassandra_port => node['cassandra']['cassandra_port'], :rep_factor => replication_factor, :DC_NAME => node['cassandra']['datacenter_name']+node.chef_environment, :REP_STRING => conf_dcname_with_rep, 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 078b9b1cd9..99a185e31b 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 @@ -73,6 +73,7 @@ users: cassandraConfig: cassandraHosts: [<%= @cassandra_ip %>] + cassandraPort: <%= @cassandra_port %> localDataCenter: <%= @DC_NAME %> reconnectTimeout : 30000 socketReadTimeout: <%= @socket_read_timeout %> diff --git a/catalog-be/src/main/resources/config/configuration.yaml b/catalog-be/src/main/resources/config/configuration.yaml index 2a7e8e35d1..2e84d6106b 100644 --- a/catalog-be/src/main/resources/config/configuration.yaml +++ b/catalog-be/src/main/resources/config/configuration.yaml @@ -92,6 +92,7 @@ neo4j: cassandraConfig: cassandraHosts: [192.168.33.10] + cassandraPort: 9042 localDataCenter: DC-sdc-iltlv650 reconnectTimeout : 30000 authenticate: true diff --git a/catalog-be/src/test/resources/config/catalog-be/configuration.yaml b/catalog-be/src/test/resources/config/catalog-be/configuration.yaml index 6211a77042..dc1d199fcd 100644 --- a/catalog-be/src/test/resources/config/catalog-be/configuration.yaml +++ b/catalog-be/src/test/resources/config/catalog-be/configuration.yaml @@ -74,6 +74,7 @@ neo4j: cassandraConfig: cassandraHosts: ['localhost'] + cassandraPort: 9042 localDataCenter: datacenter1 reconnectTimeout : 30000 authenticate: false |