Hardcoding /opt/opscode is bad, mkay

Signed-off-by: tyler-ball <[email protected]>
chef · Feb 2, 2017 · 2b1a534 · 2b1a534
1 parent c87299b
commit 2b1a534
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/omnibus/files/private-chef-cookbooks/private-chef/templates/default/bookshelf.vm.args.erb b/omnibus/files/private-chef-cookbooks/private-chef/templates/default/bookshelf.vm.args.erb
@@ -37,6 +37,6 @@
 <%- if node['private_chef']['fips_enabled'] -%>
 ## Runtime switches to enable loading custom crypto module
 ## that supports OpenSSL-FIPS
--env ERLANG_CRYPTO2_PATH /opt/opscode/embedded/lib/erlang-crypto2/priv
--pa /opt/opscode/embedded/lib/erlang-crypto2/ebin
+-env ERLANG_CRYPTO2_PATH <%= File.join(node['private_chef']['install_path'], "/embedded/lib/erlang-crypto2/priv") =%>
+-pa <%= File.join(node['private_chef']['install_path'], "/embedded/lib/erlang-crypto2/ebin") =%>
 <%- end -%>
diff --git a/omnibus/files/private-chef-cookbooks/private-chef/templates/default/oc_bifrost.vm.args.erb b/omnibus/files/private-chef-cookbooks/private-chef/templates/default/oc_bifrost.vm.args.erb
@@ -26,6 +26,6 @@
 <%- if node['private_chef']['fips_enabled'] -%>
 ## Runtime switches to enable loading custom crypto module
 ## that supports OpenSSL-FIPS
--env ERLANG_CRYPTO2_PATH /opt/opscode/embedded/lib/erlang-crypto2/priv
--pa /opt/opscode/embedded/lib/erlang-crypto2/ebin
+-env ERLANG_CRYPTO2_PATH <%= File.join(node['private_chef']['install_path'], "/embedded/lib/erlang-crypto2/priv") =%>
+-pa <%= File.join(node['private_chef']['install_path'], "/embedded/lib/erlang-crypto2/ebin") =%>
 <%- end -%>
diff --git a/omnibus/files/private-chef-cookbooks/private-chef/templates/default/oc_erchef.vm.args.erb b/omnibus/files/private-chef-cookbooks/private-chef/templates/default/oc_erchef.vm.args.erb
@@ -33,6 +33,6 @@
 <%- if node['private_chef']['fips_enabled'] -%>
 ## Runtime switches to enable loading custom crypto module
 ## that supports OpenSSL-FIPS
--env ERLANG_CRYPTO2_PATH /opt/opscode/embedded/lib/erlang-crypto2/priv
--pa /opt/opscode/embedded/lib/erlang-crypto2/ebin
+-env ERLANG_CRYPTO2_PATH <%= File.join(node['private_chef']['install_path'], "/embedded/lib/erlang-crypto2/priv") =%>
+-pa <%= File.join(node['private_chef']['install_path'], "/embedded/lib/erlang-crypto2/ebin") =%>
 <%- end -%>
diff --git a/...iles/private-chef-cookbooks/private-chef/templates/default/opscode-chef-mover.vm.args.erb b/...iles/private-chef-cookbooks/private-chef/templates/default/opscode-chef-mover.vm.args.erb
@@ -24,6 +24,6 @@
 <%- if node['private_chef']['fips_enabled'] -%>
 ## Runtime switches to enable loading custom crypto module
 ## that supports OpenSSL-FIPS
--env ERLANG_CRYPTO2_PATH /opt/opscode/embedded/lib/erlang-crypto2/priv
--pa /opt/opscode/embedded/lib/erlang-crypto2/ebin
+-env ERLANG_CRYPTO2_PATH <%= File.join(node['private_chef']['install_path'], "/embedded/lib/erlang-crypto2/priv") =%>
+-pa <%= File.join(node['private_chef']['install_path'], "/embedded/lib/erlang-crypto2/ebin") =%>
 <%- end -%>