From 0b3deea8c5c10dce260c25908e9b2d89638df148 Mon Sep 17 00:00:00 2001 From: c00149107 Date: Mon, 22 Jan 2018 10:45:44 +0800 Subject: [PATCH] Add mso.vfc.properties Add mso.vfc.properties config file Change-Id: I3beaa8cd7df4ab4a1d47d1fc704507600576a9b9 Issue-ID: SO-383 Signed-off-by: c00149107 --- attributes/default.rb | 16 +++++++++ recipes/mso-po-adapter-config.rb | 2 +- .../mso-po-adapter-config/mso.vfc.properties | 39 ++++++++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 templates/default/mso-po-adapter-config/mso.vfc.properties diff --git a/attributes/default.rb b/attributes/default.rb index a9420c8..168d86e 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -96,6 +96,22 @@ node.default["mso-po-adapter-config"]["network"]["heat.delete.pollInterval"] = " node.default["mso-po-adapter-config"]["network"]["org.openecomp.mso.adapters.tenant.default_x_aic_orm_client_string"] = "ECOMP-MSO" node.default["mso-po-adapter-config"]["network"]["org.openecomp.mso.adapters.default_keystone_url_version"] = "/v2.0" node.default["mso-po-adapter-config"]["network"]["org.openecomp.mso.adapters.default_keystone_reg_ex"] = "/[vV][0-9]" +#vfc +node.default["mso-po-adapter-config"]["vfc"]["nwbpelauth"] = node["mso-po-adapter-config"]["nwbpelauth"] +node.default["mso-po-adapter-config"]["vfc"]["sockettimeout"] = "5" +node.default["mso-po-adapter-config"]["vfc"]["connecttimeout"] = "5" +node.default["mso-po-adapter-config"]["vfc"]["retrycount"] = "5" +node.default["mso-po-adapter-config"]["vfc"]["retryinterval"] = "-15" +node.default["mso-po-adapter-config"]["vfc"]["retrylist"] = "408,429,500,502,503,504,900" +node.default["mso-po-adapter-config"]["vfc"]["po.retryCodes"] = "504" +node.default["mso-po-adapter-config"]["vfc"]["po.retryDelay"] = "5" +node.default["mso-po-adapter-config"]["vfc"]["po.retryCount"] = "3" +node.default["mso-po-adapter-config"]["vfc"]["heat.create.pollInterval"] = "15" +node.default["mso-po-adapter-config"]["vfc"]["heat.delete.pollTimeout"] = "300" +node.default["mso-po-adapter-config"]["vfc"]["heat.delete.pollInterval"] = "15" +node.default["mso-po-adapter-config"]["vfc"]["org.openecomp.mso.adapters.tenant.default_x_aic_orm_client_string"] = "ECOMP-MSO" +node.default["mso-po-adapter-config"]["vfc"]["org.openecomp.mso.adapters.default_keystone_url_version"] = "/v2.0" +node.default["mso-po-adapter-config"]["vfc"]["org.openecomp.mso.adapters.default_keystone_reg_ex"] = "/[vV][0-9]" #tenant node.default["mso-po-adapter-config"]["tenant"]["org.openecomp.mso.adapters.tenant.default_tenant_description"] = "ECOMP Tenant" node.default["mso-po-adapter-config"]["tenant"]["org.openecomp.mso.adapters.tenant.default_region_type"] = "single" diff --git a/recipes/mso-po-adapter-config.rb b/recipes/mso-po-adapter-config.rb index 5c7abe8..d6de166 100644 --- a/recipes/mso-po-adapter-config.rb +++ b/recipes/mso-po-adapter-config.rb @@ -6,7 +6,7 @@ include_recipe 'mso-config::createConfigDirectories' ################ # ###### -['cloud_config.json','mso.vnf.properties','mso.network.properties','mso.tenant.properties'].each do |file| +['cloud_config.json','mso.vnf.properties','mso.network.properties','mso.vfc.properties','mso.tenant.properties'].each do |file| template "#{node['mso_config_path']}#{file}" do source "mso-po-adapter-config/#{file}" owner "jboss" diff --git a/templates/default/mso-po-adapter-config/mso.vfc.properties b/templates/default/mso-po-adapter-config/mso.vfc.properties new file mode 100644 index 0000000..d61d533 --- /dev/null +++ b/templates/default/mso-po-adapter-config/mso.vfc.properties @@ -0,0 +1,39 @@ +# MSO Properties go here +org.openecomp.mso.adapters.vfc.bpelauth=<%= @var["vfc"]["nwbpelauth"] %> + +# Socket timeout for BPEL client (in seconds) +org.openecomp.mso.adapters.vfc.sockettimeout=<%= @var["vfc"]["sockettimeout"] %> + +# Connect timeout for BPEL client (in seconds) +org.openecomp.mso.adapters.vfc.connecttimeout=<%= @var["vfc"]["connecttimeout"] %> + +# Max number of times to retry for BPEL client +org.openecomp.mso.adapters.vfc.retrycount=<%= @var["vfc"]["retrycount"] %> + +# Default interval to wait between retries (in seconds), negative means use backoff algorithm +org.openecomp.mso.adapters.vfc.retryinterval=<%= @var["vfc"]["retryinterval"] %> + +# Default list of response codes to trigger a retry (900 is "connection failed") +org.openecomp.mso.adapters.vfc.retrylist=<%= @var["vfc"]["retrylist"] %> + +########### +#po +### +ecomp.mso.adapters.po.retryCodes=<%= @var["vfc"]["po.retryCodes"] %> +ecomp.mso.adapters.po.retryDelay=<%= @var["vfc"]["po.retryDelay"] %> +ecomp.mso.adapters.po.retryCount=<%= @var["vfc"]["po.retryCount"] %> + +########### +#heat +### +ecomp.mso.adapters.heat.create.pollInterval=<%= @var["vfc"]["heat.create.pollInterval"] %> +ecomp.mso.adapters.heat.delete.pollTimeout=<%= @var["vfc"]["heat.delete.pollTimeout"] %> +ecomp.mso.adapters.heat.delete.pollInterval=<%= @var["vfc"]["heat.delete.pollInterval"] %> + +########### +#needed in vfc file also for keystoneEP/ORM +########### +org.openecomp.mso.adapters.tenant.default_x_aic_orm_client_string=<%= @var["vfc"]["org.openecomp.mso.adapters.tenant.default_x_aic_orm_client_string"] %> +org.openecomp.mso.adapters.default_keystone_url_version=<%= @var["vfc"]["org.openecomp.mso.adapters.default_keystone_url_version"] %> +org.openecomp.mso.adapters.default_keystone_reg_ex=<%= @var["vfc"]["org.openecomp.mso.adapters.default_keystone_reg_ex"] %> + -- 2.16.6