diff options
| author |   Michael Lando <ml636r@att.com> | 2017-06-17 22:40:44 +0300 |
|---|---|---|
| committer | Michael Lando <ml636r@att.com> | 2017-06-18 07:20:49 +0300 |
| commit | 4d97d5fac309ce0d66938e5ccd0349e2660d4e23 (patch) | |
| tree | 3f921054f997d1962fa6f9db9a0119e31a851eea /sdc-os-chef | |
| parent | 89786d31f266a205857cae0177904c249ac6a512 (diff) | |
[sdc] update code of sdc
Change-Id: If9f37c80b659cb67b34d18e6c019defecca58b9a
Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'sdc-os-chef')
6 files changed, 10 insertions, 9 deletions
diff --git a/sdc-os-chef/scripts/docker_build.sh b/sdc-os-chef/scripts/docker_build.sh index 03c922ee77..d2f9820356 100644 --- a/sdc-os-chef/scripts/docker_build.sh +++ b/sdc-os-chef/scripts/docker_build.sh @@ -43,8 +43,8 @@ LOG=$WORK_DIR/$LOGFILE DOCKER_REP=dockercentral.it.att.com:5100 ECOMP_REP=${DOCKER_REP}/com.att.sdc/openecomp REL=`/usr/bin/xml_grep --text_only parent/version /data/sdc-os-chef/pom.xml` -DOX_VER=` /bin/grep AMDOCS /data/sdc-os-chef/versions.properties | awk '{print $2}' | awk -F"." '{print $1}'` -DOX_NUM=` /bin/grep AMDOCS /data/sdc-os-chef/versions.properties | awk '{print $2}' | awk -F"." '{print substr($NF,1,4)}' ` +DOX_VER=` /bin/grep ONBOARDING /data/sdc-os-chef/versions.properties | awk '{print $2}' | awk -F"." '{print $1}'` +DOX_NUM=` /bin/grep ONBOARDING /data/sdc-os-chef/versions.properties | awk '{print $2}' | awk -F"." '{print substr($NF,1,4)}' ` VERSION=` /bin/grep ASDC /data/sdc-os-chef/versions.properties | awk '{print $2}' ` MAVEN_REPO=mavencentral.it.att.com:8084/nexus/content/repositories ONBOARD_GR=com/att/asdc/onboarding/${DOX_VER}/${DOX_NUM} diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/user.py b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/user.py index 90e44561ce..cb230e2068 100644 --- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/user.py +++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/user.py @@ -56,7 +56,7 @@ def createUser( firstName, lastName, userId , email_dom , role ): userId = [ "demo" , "op0001" , "gv0001" , "jh0003" , "jm0007" , "cs0008" ] firstName = [ "demo" , "Oper" , "Giuseppe" , "Jimmy" , "Joni" , "Carlos" ] lastName = [ "demo" , "P" , "Verdi" , "Hendrix" , "Mitchell" , "Santana" ] -role = [ "ADMIN" , "OPS" , "ADMIN" , "GOVERNOR" , "TESTER" , "DESIGNER" ] +role = [ "ADMIN" , "OPS" , "GOVERNOR" , "ADMIN" , "TESTER" , "DESIGNER" ] email_dom = "openecomp.org" beStat=0 diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb index 418211f539..7cf8d6b7b8 100644 --- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb +++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb @@ -529,8 +529,8 @@ onboarding: # #GSS IDNS switchoverDetector: - gBeFqdn: - gFeFqdn: + gBeFqdn: + gFeFqdn: beVip: 1.2.3.4 feVip: 1.2.3.4 beResolveAttempts: 3 @@ -539,7 +539,7 @@ switchoverDetector: interval: 60 changePriorityUser: ecompasdc changePriorityPassword: ecompasdc123 - publishNetworkUrl: + publishNetworkUrl: publishNetworkBody: '{"note":"comment"}' groups: beSet: { changePriorityUrl: "", changePriorityBody: '{"name":"","uri":"","no_ad_redirection":false,"v4groups":{"failover_groups":["","","failover_policy":["FAILALL"]},"comment":"","intended_app_proto":"DNS"}'} diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default/zusammen.tgz b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default/zusammen.tgz Binary files differdeleted file mode 100644 index 0a9842917d..0000000000 --- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default/zusammen.tgz +++ /dev/null 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 7c902ea858..4a04a9ba67 100644 --- 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 @@ -1,5 +1,5 @@ working_directory = "/tmp" -cl_release="1.1.0" +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 @@ -27,7 +27,7 @@ bash "import-Comformance" do cd /tmp/sdctool/scripts /bin/chmod +x sdcSchemaFileImport.sh - echo "execute /tmp/sdctool/scripts/sdcSchemaFileImport.sh $conf_dir/$schema_file_name #{cl_release} $cl_version $conf_dir " + echo "execute /tmp/sdctool/scripts/sdcSchemaFileImport.sh $conf_dir/$schema_file_name #{cl_release} ${cl_version} ${conf_dir} " ./sdcSchemaFileImport.sh ${conf_dir}/${schema_file_name} #{cl_release} ${cl_version} ${conf_dir} EOH end diff --git a/sdc-os-chef/sdc-cassandra/startup.sh b/sdc-os-chef/sdc-cassandra/startup.sh index 3c001dfbab..6107f60396 100755 --- a/sdc-os-chef/sdc-cassandra/startup.sh +++ b/sdc-os-chef/sdc-cassandra/startup.sh @@ -2,7 +2,8 @@ cd /root/chef-solo mkdir -p /root/chef-solo/cookbooks/cassandra-actions/attributes -echo "normal['version'] = \"${RELEASE}\"" > /root/chef-solo/cookbooks/cassandra-actions/attributes/default.rb +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} |