summaryrefslogtreecommitdiffstats
path: root/catalog-fe/sdc-frontend
diff options
context:
space:
mode:
Diffstat (limited to 'catalog-fe/sdc-frontend')
-rw-r--r--catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb1
-rw-r--r--catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb3
2 files changed, 4 insertions, 0 deletions
diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb
index 819638ac08..73176ed1c3 100644
--- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb
+++ b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb
@@ -13,6 +13,7 @@ template "catalog-fe-config" do
:basic_auth_flag => node['basic_auth']['enabled'],
:user_name => node['basic_auth'][:user_name],
:user_pass => node['basic_auth'][:user_pass],
+ :permittedAncestors => "#{ENV['permittedAncestors']}",
:dcae_fe_vip => node['DCAE_FE_VIP']
})
end
diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb
index 8dc3c51df3..1b10845aaa 100644
--- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb
+++ b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb
@@ -124,3 +124,6 @@ healthStatusExclude:
- PORTAL
- CATALOG_FACADE_MS
- External API
+
+#Space separated list of permitted ancestors
+permittedAncestors: <%= @permittedAncestors %>