Merge pull request #1 from srijitncoupa/snair/14.1.6.19-fipsworkaround

chef#3398: Fix for FIPS enabled in bookshelf using bookshelf s3 url with …
srijitncoupa · Jul 8, 2022 · 058367e · 058367e
2 parents 5b22806 + c6713e6
commit 058367e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/omnibus/files/server-ctl-cookbooks/infra-server/templates/default/oc_erchef.config.erb b/omnibus/files/server-ctl-cookbooks/infra-server/templates/default/oc_erchef.config.erb
@@ -210,8 +210,9 @@
         %%
         %% This is the reason that the only supported configuration for the fips
         %% package is standalone. We will allow http over localhost so that the
-        %% chef server can talk to bookshelf.
-        {s3_url, "http://<%= node['private_chef']['bookshelf']['listen'] %>:<%= node['private_chef']['bookshelf']['port'] %>"},
+        %% chef server can talk to bookshelf. We can give provide bookshelf['url'] = 'http://127.0.0.1:4321' for naking it work for FIPS enabled
+       %% {s3_url, "http://<%= node['private_chef']['bookshelf']['listen'] %>:<%= node['private_chef']['bookshelf']['port'] %>"},
+         {s3_url, "<%= @helper.bookshelf_s3_url %>"},
         <% else -%>
         {s3_url, "<%= @helper.bookshelf_s3_url %>"},
         <% end %>