diff options
| author |   Michael Lando <ml636r@att.com> | 2018-01-08 10:52:07 +0200 |
|---|---|---|
| committer | Michael Lando <ml636r@att.com> | 2018-01-08 13:43:07 +0000 |
| commit | 50ffa6b75d42f85bd0594e1306677eb11fb47a2c (patch) | |
| tree | df675afef0205117f7c1d4e3c1e52c68ca2db5f4 /sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates | |
| parent | 6f0d1e2de4bfba8c203b81c0e055c0b8c5e79060 (diff) | |
expose timeout setting
expose setting of time out in env.json
remove the hard codeing of password in the configuration,
cs password is set using the envjson.
Change-Id: I09cc1f99914f444900e6b73d2ae438c72527ba2c
Issue-ID: SDC-833
Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates')
2 files changed, 5 insertions, 3 deletions
diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb index 9ed32d2939..825dd54061 100644 --- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb +++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb @@ -72,9 +72,11 @@ cassandraConfig: cassandraHosts: [<%= @cassandra_ip %>] localDataCenter: <%= @DC_NAME %> reconnectTimeout : 30000 + socketReadTimeout: <%= @socket_read_timeout %> + socketConnectTimeout: <%= @socket_connect_timeout %> authenticate: true - username: asdc_user - password: Aa1234%^! + username: <%= @cassandra_usr %> + password: <%= @cassandra_pwd %> ssl: false truststorePath : /config/.truststore truststorePassword : Aa123456 diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-titan.properties.erb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-titan.properties.erb index 18b69b3970..cf885e62bb 100644 --- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-titan.properties.erb +++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-titan.properties.erb @@ -3,7 +3,7 @@ storage.hostname=<%= @CASSANDRA_IP %> storage.port=9160 storage.username=<%= @CASSANDRA_USR %> storage.password=<%= @CASSANDRA_PWD %> -storage.connection-timeout=10000 +storage.connection-timeout=<%= @titan_connection_timeout %> storage.cassandra.keyspace=sdctitan storage.cassandra.ssl.enabled=false |