[SDC] fix import zip issue

Change-Id: I51ec3af1c31cf9fdbe39e235e54f24e110d6938f
Signed-off-by: Michael Lando <ml636r@att.com>

diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index d14cfd1..d0131e4 100644 (file)
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -20,32 +20,53 @@
        <build>
                <plugins>
                        <plugin>
-                               <groupId>com.google.code.maven-replacer-plugin</groupId>
-                               <artifactId>replacer</artifactId>
-                               <version>1.5.3</version>
+                               <artifactId>maven-clean-plugin</artifactId>
+                               <version>3.0.0</version>
                                <executions>
                                        <execution>
-                                               <phase>prepare-package</phase>
+                                               <id>clean.tosca.chef.os.folder</id>
+                                               <phase>clean</phase>
                                                <goals>
-                                                       <goal>replace</goal>
+                                                       <goal>clean</goal>
                                                </goals>
+                                               <configuration>
+                                                       <filesets>
+                                                               <fileset>
+                                                                       <directory>${project.basedir}\sdc-cassandra\chef-repo\cookbooks\cassandra-actions\attributes\</directory>
+                                                                       <followSymlinks>false</followSymlinks>
+                                                                       <includes>
+                                                                               <include>**/default.rb</include>
+                                                                       </includes>
+                                                               </fileset>
+                                                       </filesets>
+                                               </configuration>
                                        </execution>
                                </executions>
-
+                       </plugin>
+                       <plugin>
+                               <groupId>ru.yaal.maven</groupId>
+                               <artifactId>write-text-files-maven-plugin</artifactId>
+                               <version>1.1</version>
                                <configuration>
-                                       <basedir>${project.basedir}</basedir>
-                                       <includes>
-                                               <include>sdc-backend/Dockerfile</include>
-                                               <include>sdc-frontend/Dockerfile</include>
-                                               <include>scripts/docker_run.sh</include>
-                                       </includes>
-                                       <replacements>
-                                               <replacement>
-                                                       <token>__SDC-RELEASE__</token>
-                                                       <value>${project.version}</value>
-                                               </replacement>
-                                       </replacements>
+                                       <charset>UTF-8</charset>
+                                       <files>
+                                               <file>
+                                                       <path>${project.basedir}\sdc-cassandra\chef-repo\cookbooks\cassandra-actions\attributes\default.rb</path>
+                                                       <lines>
+                                                               <line>normal['version'] = "${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</line>
+                                                       </lines>
+                                               </file>
+                                       </files>
                                </configuration>
+                               <executions>
+                                       <execution>
+                                               <id>write-text-files</id>
+                                               <phase>prepare-package</phase>
+                                               <goals>
+                                                       <goal>write-text-files</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
                        </plugin>
                </plugins>
        </build>

diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/consumers.py b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/consumers.py
index c7d6fe7..1bdb3a4 100644 (file)
--- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/consumers.py
+++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/consumers.py
@@ -52,7 +52,7 @@ def createConsumer( consumerName, consumerSalt, consumerPass ):
 ##############################
 #    Definitions
 ##############################
-consumersList = [ "aai" , "appc" , "dcae" , "mso" , "sdnc" , "vid" ]
+consumersList = [ "aai" , "appc" , "dcae" , "mso" , "sdnc" , "vid" , "cognita" ]
 salt = "9cd4c3ad2a6f6ce3f3414e68b5157e63"
 password = "35371c046f88c603ccba152cb3db34ec4475cb2e5713f2fc0a43bf18a5243495"
 beStat=0

diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/07-importComformance.rb b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/07-importComformance.rb
index c6ff148..f60c697 100644 (file)
--- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/07-importComformance.rb
+++ b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/07-importComformance.rb
@@ -2,16 +2,6 @@ working_directory =  "/tmp"
 cl_release=node['version'].split('.')[0..2].join('.').split('-')[0]
 printf("\033[33mcl_release=[%s]\n\033[0m", cl_release)
 
-cookbook_file "/tmp/sdctool.tar" do
-   source "sdctool.tar"
-end
-
-bash "extract sdctool.tar" do
-  cwd "#{working_directory}"
-  code <<-EOH
-    tar xvf /tmp/sdctool.tar
-  EOH
-end
 
 
 bash "import-Comformance" do

diff --git a/sdc-os-chef/sdc-cassandra/startup.sh b/sdc-os-chef/sdc-cassandra/startup.sh
index 6107f60..2f7cc3c 100755 (executable)
--- a/sdc-os-chef/sdc-cassandra/startup.sh
+++ b/sdc-os-chef/sdc-cassandra/startup.sh
@@ -1,9 +1,6 @@
 #!/bin/bash
 
 cd /root/chef-solo
-mkdir -p /root/chef-solo/cookbooks/cassandra-actions/attributes
-cl_rel=`basename /root/chef-solo/cookbooks/cassandra-actions/files/default/SDC* .zip|awk -F"-" '{print $2}'`
-echo "normal['version'] = \"${cl_rel}\""   > /root/chef-solo/cookbooks/cassandra-actions/attributes/default.rb
 echo "normal['HOST_IP'] = \"${HOST_IP}\"" >> /root/chef-solo/cookbooks/cassandra-actions/attributes/default.rb
 
 export CHEFNAME=${ENVNAME}