From: Idan Amit <ia096e@intl.att.com>
Date: Tue, 8 Aug 2017 07:32:54 +0000 (+0300)
Subject: [DevOps] - move the keystore copy before the
X-Git-Tag: 1.0.0-Amsterdam~191
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F17%2F6917%2F1;p=sdc.git

[DevOps] - move the keystore copy before the

 jetty modules creation

Change-Id: Ic7d49df2c60ed8385f90c25778ebd4ad747e51e4
Signed-off-by: Idan Amit <ia096e@intl.att.com>
---

diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_setup_configuration.rb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb
similarity index 100%
rename from sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_setup_configuration.rb
rename to sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb
diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_locate_wars.rb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_jetty_Modules.rb
similarity index 56%
rename from sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_locate_wars.rb
rename to sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_jetty_Modules.rb
index af3dea15ef..3ec16e8924 100644
--- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_locate_wars.rb
+++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_jetty_Modules.rb
@@ -12,15 +12,4 @@ EOH
 not_if "ls /#{jetty_base}/start.d/https.ini"
 end
 
-###### copy catalog-be.war
-
-
-
-###### copy onboarding-be.war& api-docs.war
-#bash "copy-onboarding-be" do
-#   code <<-EOH
-#       /bin/tar -xvf /var/tmp/onboarding-be.tar -C  /var/tmp/
-#           mv /var/tmp/onboarding-be*.war /var/tmp//api-docs*.war  #{jetty_base}/webapps
-#   EOH
-#end
 
diff --git a/sdc-os-chef/sdc-backend/chef-solo/roles/catalog-be.json b/sdc-os-chef/sdc-backend/chef-solo/roles/catalog-be.json
index e8928bbdc7..9fc7b8d1dc 100644
--- a/sdc-os-chef/sdc-backend/chef-solo/roles/catalog-be.json
+++ b/sdc-os-chef/sdc-backend/chef-solo/roles/catalog-be.json
@@ -11,8 +11,8 @@
   "chef_type": "role",
   "run_list": [
     "recipe[sdc-catalog-be::BE_1_cleanup_jettydir]",
-    "recipe[sdc-catalog-be::BE_2_locate_wars]",
-    "recipe[sdc-catalog-be::BE_4_setup_configuration]",
+    "recipe[sdc-catalog-be::BE_2_setup_configuration]",
+    "recipe[sdc-catalog-be::BE_4_jetty_Modules]",
     "recipe[sdc-catalog-be::BE_5_setup_elasticsearch]",
     "recipe[sdc-catalog-be::BE_6_setup_portal_properties]",
     "recipe[sdc-catalog-be::BE_7_logback]",
diff --git a/sdc-os-chef/sdc-frontend/chef-solo/roles/catalog-fe.json b/sdc-os-chef/sdc-frontend/chef-solo/roles/catalog-fe.json
index 63b55aa712..547c00657c 100644
--- a/sdc-os-chef/sdc-frontend/chef-solo/roles/catalog-fe.json
+++ b/sdc-os-chef/sdc-frontend/chef-solo/roles/catalog-fe.json
@@ -15,8 +15,8 @@
     "recipe[sdc-catalog-fe::FE_3_errors_config]",
     "recipe[sdc-catalog-fe::FE_4_logback]",
     "recipe[sdc-catalog-fe::FE_5_rest_configuration]",
-    "recipe[sdc-catalog-fe::FE_6_create_jetty_modules]",
-    "recipe[sdc-catalog-fe::FE_7_locate_keystore]"
+    "recipe[sdc-catalog-fe::FE_7_locate_keystore]",
+    "recipe[sdc-catalog-fe::FE_6_create_jetty_modules]"
   ],
   "env_run_lists": {
   }