summaryrefslogtreecommitdiffstats
path: root/asdctool/sdc-cassandra-init
diff options
context:
space:
mode:
Diffstat (limited to 'asdctool/sdc-cassandra-init')
-rw-r--r--asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/03-schemaCreation.rb14
-rw-r--r--asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/04-importConformance.rb (renamed from asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/04-importComformance.rb)2
-rw-r--r--asdctool/sdc-cassandra-init/chef-solo/roles/cassandra-actions.json2
3 files changed, 9 insertions, 9 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 4de50f6492..b046b0da51 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
@@ -18,12 +18,12 @@ template "janusgraph.properties" do
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],
+ :DC_NAME => node['cassandra']['datacenter_name'],
+ :cassandra_ip => node['Nodes']['CS'].first,
+ :cassandra_pwd => node['cassandra'][:cassandra_password],
+ :cassandra_usr => node['cassandra'][:cassandra_user],
:janusgraph_connection_timeout => node['cassandra']['janusgraph_connection_timeout'],
- :replication_factor => node['cassandra']['replication_factor']
+ :replication_factor => node['cassandra']['replication_factor']
})
end
@@ -58,7 +58,7 @@ template "/tmp/sdctool/config/elasticsearch.yml" do
})
end
-bash "excuting-schema-creation" do
+bash "executing-schema-creation" do
code <<-EOH
cd /tmp
chmod +x /tmp/sdctool/scripts/schemaCreation.sh
@@ -66,7 +66,7 @@ bash "excuting-schema-creation" do
EOH
end
-bash "excuting-janusGraphSchemaCreation.sh" do
+bash "executing-janusGraphSchemaCreation.sh" do
code <<-EOH
chmod +x /tmp/sdctool/scripts/janusGraphSchemaCreation.sh
/tmp/sdctool/scripts/janusGraphSchemaCreation.sh /tmp/sdctool/config
diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/04-importComformance.rb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/04-importConformance.rb
index 188aa1d031..0490c89668 100644
--- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/04-importComformance.rb
+++ b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/04-importConformance.rb
@@ -4,7 +4,7 @@ printf("\033[33mcl_release=[%s]\n\033[0m", cl_release)
-bash "import-Comformance" do
+bash "import-Conformance" do
cwd "#{working_directory}"
code <<-EOH
conf_dir=/tmp/sdctool/config
diff --git a/asdctool/sdc-cassandra-init/chef-solo/roles/cassandra-actions.json b/asdctool/sdc-cassandra-init/chef-solo/roles/cassandra-actions.json
index b06e4872e3..5104d1fcb9 100644
--- a/asdctool/sdc-cassandra-init/chef-solo/roles/cassandra-actions.json
+++ b/asdctool/sdc-cassandra-init/chef-solo/roles/cassandra-actions.json
@@ -12,7 +12,7 @@
"run_list": [
"recipe[cassandra-actions::01-createCsUser]",
"recipe[cassandra-actions::03-schemaCreation]",
- "recipe[cassandra-actions::04-importComformance]"
+ "recipe[cassandra-actions::04-importConformance]"
],
"env_run_lists": {