Corrected typos in chef scripts.

Corrected typos and checkstyles.

Issue-ID: SDC-2424
Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com>
Change-Id: If2464645dad7da3fa7706e35e4ccace3ece6aeb4

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 4de50f6..b046b0d 100644 (file)
--- 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
similarity index 95%
rename from asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/04-importComformance.rb
rename to asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/04-importConformance.rb
index 188aa1d..0490c89 100644 (file)
--- 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 b06e487..5104d1f 100644 (file)
--- 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": {

diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/01-configureCassandra.rb b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/01-configureCassandra.rb
index 5b05e9b..21d43b1 100644 (file)
--- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/01-configureCassandra.rb
+++ b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/01-configureCassandra.rb
@@ -20,20 +20,20 @@ template "cassandra-yaml-config" do
     owner "cassandra"
     group "cassandra"
     mode "0755"
-    variables ({
-        :cassandra_port             => node['cassandra']['cassandra_port'],
-        :cassandra_cluster          => cluster_name,
-        :cassandra_data_dir         => node['cassandra'][:data_dir],
-        :cassandra_commitlog_dir    => node['cassandra'][:commitlog_dir],
-        :cassandra_cache_dir        => node['cassandra'][:cache_dir],
-        :seeds_address              => cas_ips,
-        :listen_address             => application_host,
-        :broadcast_address          => application_host,
-               :broadcast_rpc_address      => application_host,
-        :rpc_address                => "0.0.0.0",
-        :num_tokens                 => node['cassandra'][:num_tokens],
-        :internode_encryption       => "none",
-        :cassandra_truststore_dir   => "/etc/cassandra/cs_trust"
+    variables({
+        :cassandra_port           => node['cassandra']['cassandra_port'],
+        :cassandra_cluster        => cluster_name,
+        :cassandra_data_dir       => node['cassandra'][:data_dir],
+        :cassandra_commitlog_dir  => node['cassandra'][:commitlog_dir],
+        :cassandra_cache_dir      => node['cassandra'][:cache_dir],
+        :seeds_address            => cas_ips,
+        :listen_address           => application_host,
+        :broadcast_address        => application_host,
+        :broadcast_rpc_address    => application_host,
+        :rpc_address              => "0.0.0.0",
+        :num_tokens               => node['cassandra'][:num_tokens],
+        :internode_encryption     => "none",
+        :cassandra_truststore_dir => "/etc/cassandra/cs_trust"
      })
 end
 
@@ -44,7 +44,7 @@ template "cassandra-rackdc.properties" do
     owner "cassandra"
     group "cassandra"
     mode "0755"
-    variables ({
+    variables({
         :dc => node['cassandra']['datacenter_name'],
         :rack => "Rack"+"#{rackNum}"
     })

diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/02-changeCSpass.rb b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/02-changeCSpass.rb
index ae582cf..8ebdeef 100644 (file)
--- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/02-changeCSpass.rb
+++ b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/02-changeCSpass.rb
@@ -11,9 +11,9 @@ template "/tmp/change_cassandra_pass.sh" do
   sensitive true
   mode 0755
   variables({
-     :cassandra_ip => application_host,
-     :cassandra_pwd => ENV['CS_PASSWORD'],
-     :cassandra_port   => node['cassandra']['cassandra_port']
+     :cassandra_ip   => application_host,
+     :cassandra_pwd  => ENV['CS_PASSWORD'],
+     :cassandra_port => node['cassandra']['cassandra_port']
   })
 end