From: Tal Gitelman <tg851x@intl.att.com>
Date: Tue, 3 Oct 2017 15:59:50 +0000 (+0300)
Subject: ONAP normative fixes
X-Git-Tag: 1.0.0-Amsterdam~105^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b31b82e5d988041aba7e6cf36ee463b7af541e73;p=sdc.git

ONAP normative fixes

Change-Id: I746a9bafa279103b907fd24e623b1854032de793
Issue-ID: SDC-410
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
---

diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index 84e9274acf..163655691e 100644
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -71,9 +71,7 @@
                                 ${project.basedir}\sdc-cassandra\chef-repo\cookbooks\cassandra-actions\attributes\default.rb
                             </path>
                             <lines>
-                                <line>normal['version'] =
-                                    "${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
-                                </line>
+                                <line>normal['version'] ="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</line>
                             </lines>
                         </file>
                     </files>
diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb
deleted file mode 100644
index dac5853353..0000000000
--- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-normal['version'] =
-                                    "1.1.0"