summaryrefslogtreecommitdiffstats
path: root/sdc-os-chef
diff options
context:
space:
mode:
authorIdan Amit <ia096e@intl.att.com>2018-01-31 18:57:31 +0200
committerMichael Lando <ml636r@att.com>2018-02-01 08:15:25 +0000
commit162f50777e13eebe3b27ec8364ee892be628f7b0 (patch)
treeebce6947b372a61827745e9985eef0ac3f144af2 /sdc-os-chef
parent3c9f4df71b978e92a6eeb6f22bc7535e749d11c2 (diff)
Align configuration for new design
Aligned the designers configuration according to the new design addition and changes Change-Id: Id08942b5a8adbac10bbe76bdd8a2a6f093ec8b46 Issue-ID: SDC-975 Signed-off-by: Idan Amit <ia096e@intl.att.com>
Diffstat (limited to 'sdc-os-chef')
-rw-r--r--sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb10
-rw-r--r--sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb24
2 files changed, 17 insertions, 17 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 236bb467f7..9e5953c394 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,12 +23,10 @@ template "plugins-fe-config" do
group "jetty"
mode "0755"
variables({
- :dcae_protocol => node['Plugins']['DCAE']['dcae_protocol'],
- :dcae_host => node['Plugins']['DCAE']['dcae_host'],
- :dcae_port => node['Plugins']['DCAE']['dcae_port'],
- :workflow_protocol => node['Plugins']['WORKFLOW']['workflow_protocol'],
- :workflow_host => node['Plugins']['WORKFLOW']['workflow_host'],
- :workflow_port => node['Plugins']['WORKFLOW']['workflow_port']
+ :dcae_discovery_url => node['Plugins']['DCAE']['dcae_discovery_url'],
+ :dcae_source_url => node['Plugins']['DCAE']['dcae_source_url'],
+ :workflow_discovery_url => node['Plugins']['WORKFLOW']['workflow_discovery_url'],
+ :workflow_source_url => node['Plugins']['WORKFLOW']['workflow_source_url']
})
end
diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb
index ab13d4f2ca..0a3b15c92b 100644
--- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb
+++ b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb
@@ -1,23 +1,25 @@
pluginsList:
- pluginId: DCAE
- pluginProtocol: <%= @dcae_protocol %>
- pluginHost: <%= @dcae_host %>
- pluginPort: <%= @dcae_port %>
- pluginPath: "/openoui/vnfmarket/#!/marketplace"
+ pluginDiscoveryUrl: <%= @dcae_discovery_url %>
+ pluginSourceUrl: <%= @dcae_source_url %>
pluginStateUrl: "dcae"
pluginDisplayOptions:
+ tab:
+ displayName: "DCAE"
+ displayRoles: ["TESTER"]
context:
displayName: "Monitor"
- displayContext: ["RESOURCE", "SERVICE"]
+ displayContext: ["VF", "SERVICE"]
+ displayRoles: ["DESIGNER"]
- pluginId: WORKFLOW
- pluginProtocol: <%= @workflow_protocol %>
- pluginHost: <%= @workflow_host %>
- pluginPort: <%= @workflow_port %>
- pluginPath: "/"
+ pluginDiscoveryUrl: <%= @workflow_discovery_url %>
+ pluginSourceUrl: <%= @workflow_source_url %>
pluginStateUrl: "workflowDesigner"
pluginDisplayOptions:
- top:
+ tab:
displayName: "WORKFLOW"
+ displayRoles: ["DESIGNER", "TESTER"]
context:
displayName: "Workflow Designer"
- displayContext: ["RESOURCE"] \ No newline at end of file
+ displayContext: ["VF"]
+ displayRoles: ["DESIGNER", "TESTER"] \ No newline at end of file