Commit 2cb8ec26 authored by Jason Tevnan's avatar Jason Tevnan

deepmerge needed

parent 3be81a7a
......@@ -7,9 +7,11 @@
# All rights reserved - Do Not Redistribute
#
attributes_with_secrets = node['omnibus-gitlab'].merge(get_secrets(node['omnibus-gitlab']['secrets']['backend'],
node['omnibus-gitlab']['secrets']['path'],
node['omnibus-gitlab']['secrets']['key'])['omnibus-gitlab'])
attributes_with_secrets = Chef::Mixin::DeepMerge.deep_merge(
node['omnibus-gitlab'],
get_secrets(node['omnibus-gitlab']['secrets']['backend'],
node['omnibus-gitlab']['secrets']['path'],
node['omnibus-gitlab']['secrets']['key'])['omnibus-gitlab'])
pkg_url = "#{node['omnibus-gitlab']['package']['scheme_url']}://#{node['omnibus-gitlab']['package']['base_url']}"
pkg_url = "#{node['omnibus-gitlab']['package']['scheme_url']}://#{attributes_with_secrets['package']['key']}:@#{node['omnibus-gitlab']['package']['base_url']}" if node['omnibus-gitlab']['package']['use_key']
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment