summaryrefslogtreecommitdiffstats
path: root/asdctool/sdc-cassandra-init
diff options
context:
space:
mode:
authorshrikantawachar <shrikant.awachar@amdocs.com>2019-05-20 12:11:54 +0530
committerAvi Gaffa <avi.gaffa@amdocs.com>2019-06-12 08:05:21 +0000
commit2623c8402a57e2035db69a9d92d2851050916801 (patch)
treef7311f32a5566702921a2e650b476f1ff6bf0de1 /asdctool/sdc-cassandra-init
parent799bc7e3c75de762dea7448c6f8f5d6e5f3f9671 (diff)
Upgrade SDC from Titan to Janus Graph
Upgrade SDC from Titan to Janus Graph Change-Id: I67fb8b8e60cc6751697bc5ff2f06754c92803786 Issue-ID: SDC-2296 Signed-off-by: shrikantawachar <shrikant.awachar@amdocs.com>
Diffstat (limited to 'asdctool/sdc-cassandra-init')
-rw-r--r--asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/03-schemaCreation.rb16
-rw-r--r--asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb16
-rw-r--r--asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/janusgraph.properties.erb (renamed from asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/titan.properties.erb)2
3 files changed, 17 insertions, 17 deletions
diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/03-schemaCreation.rb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/03-schemaCreation.rb
index fbfcb2ecea..4de50f6492 100644
--- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/03-schemaCreation.rb
+++ b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/03-schemaCreation.rb
@@ -12,17 +12,17 @@ bash "install tar" do
end
-template "titan.properties" do
+template "janusgraph.properties" do
sensitive true
- path "/tmp/sdctool/config/titan.properties"
- source "titan.properties.erb"
+ path "/tmp/sdctool/config/janusgraph.properties"
+ source "janusgraph.properties.erb"
mode "0755"
variables({
:DC_NAME => node['cassandra']['datacenter_name'],
:cassandra_ip => node['Nodes']['CS'].first,
:cassandra_pwd => node['cassandra'][:cassandra_password],
:cassandra_usr => node['cassandra'][:cassandra_user],
- :titan_connection_timeout => node['cassandra']['titan_connection_timeout'],
+ :janusgraph_connection_timeout => node['cassandra']['janusgraph_connection_timeout'],
:replication_factor => node['cassandra']['replication_factor']
})
end
@@ -40,7 +40,7 @@ template "/tmp/sdctool/config/configuration.yaml" do
:cassandra_port => node['cassandra']['cassandra_port'],
:rep_factor => node['cassandra']['replication_factor'],
:DC_NAME => node['cassandra']['datacenter_name'],
- :titan_Path => "/tmp/sdctool/config/",
+ :janusgraph_Path => "/tmp/sdctool/config/",
:socket_connect_timeout => node['cassandra']['socket_connect_timeout'],
:socket_read_timeout => node['cassandra']['socket_read_timeout'],
:cassandra_pwd => node['cassandra'][:cassandra_password],
@@ -66,9 +66,9 @@ bash "excuting-schema-creation" do
EOH
end
-bash "excuting-titanSchemaCreation.sh" do
+bash "excuting-janusGraphSchemaCreation.sh" do
code <<-EOH
- chmod +x /tmp/sdctool/scripts/titanSchemaCreation.sh
- /tmp/sdctool/scripts/titanSchemaCreation.sh /tmp/sdctool/config
+ chmod +x /tmp/sdctool/scripts/janusGraphSchemaCreation.sh
+ /tmp/sdctool/scripts/janusGraphSchemaCreation.sh /tmp/sdctool/config
EOH
end
diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb
index 0a658bb8d9..ab27886a47 100644
--- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb
+++ b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb
@@ -29,14 +29,14 @@ released: 2012-11-30
toscaConformanceLevel: 9.0
minToscaConformanceLevel: 3.0
-titanCfgFile: <%= @titan_Path %>/titan.properties
-titanInMemoryGraph: false
-titanLockTimeout: 1800
-# The interval to try and reconnect to titan DB when it is down during ASDC startup:
-titanReconnectIntervalInSeconds: 3
-
-# The read timeout towards Titan DB when health check is invoked:
-titanHealthCheckReadTimeout: 1
+janusGraphCfgFile: <%= @janusgraph_Path %>/janusgraph.properties
+janusGraphInMemoryGraph: false
+janusGraphLockTimeout: 1800
+# The interval to try and reconnect to JanusGraph DB when it is down during ASDC startup:
+janusGraphReconnectIntervalInSeconds: 3
+
+# The read timeout towards JanusGraph DB when health check is invoked:
+janusGraphHealthCheckReadTimeout: 1
# The interval to try and reconnect to Elasticsearch when it is down during ASDC startup:
diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/titan.properties.erb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/janusgraph.properties.erb
index 20a97be9de..60c24d7613 100644
--- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/titan.properties.erb
+++ b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/janusgraph.properties.erb
@@ -3,7 +3,7 @@ storage.hostname=<%= @cassandra_ip %>
storage.port=9160
storage.username=<%= @cassandra_usr %>
storage.password=<%= @cassandra_pwd %>
-storage.connection-timeout=<%= @titan_connection_timeout %>
+storage.connection-timeout=<%= @janusgraph_connection_timeout %>
storage.cassandra.keyspace=sdctitan