diff options
| author |   Idan Amit <ia096e@intl.att.com> | 2018-01-18 19:07:38 +0200 |
|---|---|---|
| committer | Idan Amit <ia096e@intl.att.com> | 2018-01-21 06:52:00 +0000 |
| commit | 30e728d280b77193500a7f0941db336ee60b80a6 (patch) | |
| tree | f57f86948f47f3dd2333e21e12e5cdc1ccaeff33 /sdc-os-chef/sdc-frontend | |
| parent | a7735509a29580d0bf8a9eac92f4402940b74517 (diff) | |
Update designer configuraiton file
Updated the designer configuration file to support the new display options
Made sure that the old code still works
Change-Id: Ia63cb89b0f8cb92fc86e0804afe7e2c2caea0541
Issue-ID: SDC-938
Signed-off-by: Idan Amit <ia096e@intl.att.com>
Diffstat (limited to 'sdc-os-chef/sdc-frontend')
2 files changed, 19 insertions, 22 deletions
diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb index 0d12e3b589..8612b5f5f3 100644 --- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb +++ b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb @@ -23,20 +23,12 @@ template "designers-fe-config" do group "jetty" mode "0755" variables({ + :dcae_protocol => node['Designers']['DCAE']['dcae_protocol'], :dcae_host => node['Designers']['DCAE']['dcae_host'], :dcae_port => node['Designers']['DCAE']['dcae_port'], - :dcae_path => node['Designers']['DCAE']['dcae_path'], - :dcae_state_url => node['Designers']['DCAE']['dcae_state_url'], - :dcae_protocol => node['Designers']['DCAE']['dcae_protocol'], - :dcae_button_location => node['Designers']['DCAE']['dcae_button_location'], - :dcae_tab_presentation => node['Designers']['DCAE']['dcae_tab_presentation'], + :workflow_protocol => node['Designers']['WORKFLOW']['workflow_protocol'], :workflow_host => node['Designers']['WORKFLOW']['workflow_host'], :workflow_port => node['Designers']['WORKFLOW']['workflow_port'], - :workflow_path => node['Designers']['WORKFLOW']['workflow_path'], - :workflow_state_url => node['Designers']['WORKFLOW']['workflow_state_url'], - :workflow_protocol => node['Designers']['WORKFLOW']['workflow_protocol'], - :workflow_button_location => node['Designers']['WORKFLOW']['workflow_button_location'], - :workflow_tab_presentation => node['Designers']['WORKFLOW']['workflow_tab_presentation'] }) end diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-designers-configuration.yaml.erb b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-designers-configuration.yaml.erb index f8a7999704..fd8a81b0db 100644 --- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-designers-configuration.yaml.erb +++ b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-designers-configuration.yaml.erb @@ -1,17 +1,22 @@ designersList: - - displayName: DCAE + - designerId: DCAE + designerProtocol: <%= @dcae_protocol %> designerHost: <%= @dcae_host %> designerPort: <%= @dcae_port %> - designerPath: <%= @dcae_path %> - designerStateUrl: <%= @dcae_state_url %> - designerProtocol: <%= @dcae_protocol %> - designerButtonLocation: <%= @dcae_button_location %> - designerTabPresentation: <%= @dcae_tab_presentation %> - - displayName: WORKFLOW + designerPath: "/dace" + designerStateUrl: "dcae" + designerDisplayOptions: + tab: + displayName: "monitor" + validResourceTypes: ["VF", "SERVICE"] + top: + displayName: "DCAE" + - designerId: WORKFLOW + designerProtocol: <%= @workflow_protocol %> designerHost: <%= @workflow_host %> designerPort: <%= @workflow_port %> - designerPath: <%= @workflow_path %> - designerStateUrl: <%= @workflow_state_url %> - designerProtocol: <%= @workflow_protocol %> - designerButtonLocation: <%= @workflow_button_location %> - designerTabPresentation: <%= @workflow_tab_presentation %>
\ No newline at end of file + designerPath: "/" + designerStateUrl: "workflowDesigner" + designerDisplayOptions: + top: + displayName: "Workflow Designer"
\ No newline at end of file |