aboutsummaryrefslogtreecommitdiffstats
path: root/sdc-os-chef/sdc-frontend
diff options
context:
space:
mode:
authorIdan Amit <ia096e@intl.att.com>2018-01-31 13:27:33 +0200
committerMichael Lando <ml636r@att.com>2018-01-31 14:35:13 +0000
commiteedaaf983d731d0179916b3f3a8e4d3a0d80981b (patch)
tree066eb388f47ac15ef35c98aa74618b751da47ae6 /sdc-os-chef/sdc-frontend
parent3b09e29e1e1cab9baf3b1380718a3c45126930bd (diff)
Change designer to plugin in code
Changed all the use of the designer configuration in the code to be plugin Change-Id: Id9792cbd4fb9385446780c28fb7fb5418772acf6 Issue-ID: SDC-974 Signed-off-by: Idan Amit <ia096e@intl.att.com>
Diffstat (limited to 'sdc-os-chef/sdc-frontend')
-rw-r--r--sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb18
-rw-r--r--sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-designers-configuration.yaml.erb23
-rw-r--r--sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb23
3 files changed, 32 insertions, 32 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 8612b5f5f3..236bb467f7 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
@@ -16,19 +16,19 @@ template "catalog-fe-config" do
})
end
-template "designers-fe-config" do
- path "#{jetty_base}/config/catalog-fe/designers-configuration.yaml"
- source "FE-designers-configuration.yaml.erb"
+template "plugins-fe-config" do
+ path "#{jetty_base}/config/catalog-fe/plugins-configuration.yaml"
+ source "FE-plugins-configuration.yaml.erb"
owner "jetty"
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'],
- :workflow_protocol => node['Designers']['WORKFLOW']['workflow_protocol'],
- :workflow_host => node['Designers']['WORKFLOW']['workflow_host'],
- :workflow_port => node['Designers']['WORKFLOW']['workflow_port'],
+ :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']
})
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
deleted file mode 100644
index e5c170e55b..0000000000
--- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-designers-configuration.yaml.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-designersList:
- - designerId: DCAE
- designerProtocol: <%= @dcae_protocol %>
- designerHost: <%= @dcae_host %>
- designerPort: <%= @dcae_port %>
- designerPath: "/openoui/vnfmarket/#!/marketplace"
- designerStateUrl: "dcae"
- designerDisplayOptions:
- context:
- displayName: "Monitor"
- displayContext: ["RESOURCE", "SERVICE"]
- - designerId: WORKFLOW
- designerProtocol: <%= @workflow_protocol %>
- designerHost: <%= @workflow_host %>
- designerPort: <%= @workflow_port %>
- designerPath: "/"
- designerStateUrl: "workflowDesigner"
- designerDisplayOptions:
- top:
- displayName: "WORKFLOW"
- context:
- displayName: "Workflow Designer"
- displayContext: ["RESOURCE"] \ No newline at end of file
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
new file mode 100644
index 0000000000..ab13d4f2ca
--- /dev/null
+++ b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb
@@ -0,0 +1,23 @@
+pluginsList:
+ - pluginId: DCAE
+ pluginProtocol: <%= @dcae_protocol %>
+ pluginHost: <%= @dcae_host %>
+ pluginPort: <%= @dcae_port %>
+ pluginPath: "/openoui/vnfmarket/#!/marketplace"
+ pluginStateUrl: "dcae"
+ pluginDisplayOptions:
+ context:
+ displayName: "Monitor"
+ displayContext: ["RESOURCE", "SERVICE"]
+ - pluginId: WORKFLOW
+ pluginProtocol: <%= @workflow_protocol %>
+ pluginHost: <%= @workflow_host %>
+ pluginPort: <%= @workflow_port %>
+ pluginPath: "/"
+ pluginStateUrl: "workflowDesigner"
+ pluginDisplayOptions:
+ top:
+ displayName: "WORKFLOW"
+ context:
+ displayName: "Workflow Designer"
+ displayContext: ["RESOURCE"] \ No newline at end of file