diff options
| author |   Michael Lando <ml636r@att.com> | 2017-08-07 10:19:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-08-07 10:19:02 +0000 |
| commit | 976626d62ae4f55f9d9f0e96bc954102dd38e726 (patch) | |
| tree | 881b58240dd6add92d01ac140f89c305fa0cda06 /sdc-os-chef/sdc-frontend | |
| parent | 3b1119ca51ea0de0ff28b76b916fa8b0cba54fcf (diff) | |
| parent | b2c60183d5d654b945a24ec5564807e4f691c6e8 (diff) | |
Merge "[SDC] code sync"
Diffstat (limited to 'sdc-os-chef/sdc-frontend')
3 files changed, 9 insertions, 1 deletions
diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/keystore b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/keystore Binary files differnew file mode 100644 index 0000000000..08f6cda8a7 --- /dev/null +++ b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/keystore diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_7_locate_keystore.rb b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_7_locate_keystore.rb new file mode 100644 index 0000000000..91a819adfe --- /dev/null +++ b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_7_locate_keystore.rb @@ -0,0 +1,7 @@ +jetty_base="/var/lib/jetty" +cookbook_file "/#{jetty_base}/etc/keystore" do + source "keystore" + owner "jetty" + group "jetty" + mode 0755 +end 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 9e023762d1..63b55aa712 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,7 +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_6_create_jetty_modules]", + "recipe[sdc-catalog-fe::FE_7_locate_keystore]" ], "env_run_lists": { } |