diff options
| author |   Michael Lando <ml636r@att.com> | 2018-07-29 16:13:45 +0300 |
|---|---|---|
| committer | Michael Lando <ml636r@att.com> | 2018-07-29 16:20:34 +0300 |
| commit | 5b593496b8f1b8e8be8d7d2dbcc223332e65a49b (patch) | |
| tree | 2f9dfc45191e723da69cf74be7829784e9741b94 /catalog-fe/sdc-frontend/chef-repo | |
| parent | 9200382f2ce7b4bb729aa287d0878004b2d2b4f9 (diff) | |
re base code
Change-Id: I12a5ca14a6d8a87e9316b9ff362eb131105f98a5
Issue-ID: SDC-1566
Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'catalog-fe/sdc-frontend/chef-repo')
3 files changed, 17 insertions, 2 deletions
diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/attributes/default.rb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/attributes/default.rb index fb4166b15e..108f38acbe 100644 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/attributes/default.rb +++ b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/attributes/default.rb @@ -8,6 +8,10 @@ default['jetty'][:keystore_pwd] = "OBF:1cp61iuj194s194u194w194y1is31cok" default['jetty'][:keymanager_pwd] = "OBF:1cp61iuj194s194u194w194y1is31cok" default['jetty'][:truststore_pwd] = "OBF:1cp61iuj194s194u194w194y1is31cok" +#Onboard +default['ONBOARDING_BE'][:http_port] = 8081 +default['ONBOARDING_BE'][:https_port] = 8445 + #Reserved for DCAE backend default['DCAE']['FE'][:http_port] = 8183 default['DCAE']['FE'][:https_port] = 9444 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 0cb0972dbc..280eacda27 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 @@ -23,6 +23,8 @@ template "plugins-fe-config" do variables({ :dcae_discovery_url => node['Plugins']['DCAE']['dcae_discovery_url'], :dcae_source_url => node['Plugins']['DCAE']['dcae_source_url'], + :dcae_dt_discovery_url => node['Plugins']['DCAE-TAB']['dcae_dt_discovery_url'], + :dcae_dt_source_url => node['Plugins']['DCAE-TAB']['dcae_dt_source_url'], :workflow_discovery_url => node['Plugins']['WORKFLOW']['workflow_discovery_url'], :workflow_source_url => node['Plugins']['WORKFLOW']['workflow_source_url'] }) @@ -35,4 +37,4 @@ template "onboarding-fe-config" do owner "jetty" group "jetty" mode "0755" -end
\ No newline at end of file +end diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb index 994241d326..90f20192af 100644 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb +++ b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb @@ -1,5 +1,5 @@ pluginsList: - - pluginId: DCAE + - pluginId: DCAED pluginDiscoveryUrl: <%= @dcae_discovery_url %> pluginSourceUrl: <%= @dcae_source_url %> pluginStateUrl: "dcaed" @@ -8,6 +8,15 @@ pluginsList: displayName: "Monitoring" displayContext: ["SERVICE"] displayRoles: ["DESIGNER"] + - pluginId: DCAE-DS + pluginDiscoveryUrl: <%= @dcae_dt_discovery_url %> + pluginSourceUrl: <%= @dcae_dt_source_url %> + pluginStateUrl: "dcae-ds" + pluginDisplayOptions: + tab: + displayName: "DCAE-DS" + displayRoles: ["DESIGNER"] + - pluginId: WORKFLOW pluginDiscoveryUrl: <%= @workflow_discovery_url %> pluginSourceUrl: <%= @workflow_source_url %> |