summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Daugherty <rd472p@att.com>2017-10-20 01:49:24 +0000
committerGerrit Code Review <gerrit@onap.org>2017-10-20 01:49:24 +0000
commit8e8ec9235f39c834f5a203364154aa3f20b654ef (patch)
tree5561559b381cadb8c96f4e7d9acc34a137984eaf
parenta8ac9ddf1cd25062328d18b7764092c477a8f0da (diff)
parent00aab6d9c2a2edf47b298c2a9f08b2cb760dd369 (diff)
Merge "Add mso.adapters.openecomp.db.endpoint URN mapping"
-rw-r--r--attributes/mso-bpmn-urn-config.rb1
-rw-r--r--attributes/topology.rb2
-rw-r--r--templates/default/mso-bpmn-config/mso.bpmn.urn.properties1
3 files changed, 3 insertions, 1 deletions
diff --git a/attributes/mso-bpmn-urn-config.rb b/attributes/mso-bpmn-urn-config.rb
index 04d60d1..d134c8e 100644
--- a/attributes/mso-bpmn-urn-config.rb
+++ b/attributes/mso-bpmn-urn-config.rb
@@ -18,6 +18,7 @@ node.default["mso-bpmn-urn-config"]["csiNetworkstatusEndpoint"] = "DefaultRecipe
node.default["mso-bpmn-urn-config"]["adaptersNamespace"] = "DefaultRecipe_adaptersNamespace"
node.default["mso-bpmn-urn-config"]["adaptersCompletemsoprocessEndpoint"] = "DefaultRecipe_sdncconnecttime"
node.default["mso-bpmn-urn-config"]["adaptersDbEndpoint"] = "DefaultRecipe_adaptersDbEndpoint"
+node.default["mso-bpmn-urn-config"]["adaptersOpenecompDbEndpoint"] = "DefaultRecipe_adaptersOpenecompDbEndpoint"
node.default["mso-bpmn-urn-config"]["adaptersSdncEndpoint"] = "DefaultRecipe_adaptersSdncEndpoint"
node.default["mso-bpmn-urn-config"]["adaptersSdncRestEndpoint"] = "DefaultRecipe_adaptersSdncRestEndpoint"
node.default["mso-bpmn-urn-config"]["adaptersTenantEndpoint"] = "DefaultRecipe_adaptersTenantEndpoint"
diff --git a/attributes/topology.rb b/attributes/topology.rb
index 13160fc..609ce86 100644
--- a/attributes/topology.rb
+++ b/attributes/topology.rb
@@ -2,7 +2,7 @@ require 'uri'
######################
# MSO Config Path
##########
-node.default["mso-config"]["topology"]["apih-load-balancer"] = URI.join(node["mso-bpmn-urn-config"]["adaptersDbEndpoint"], "/").to_s
+node.default["mso-config"]["topology"]["apih-load-balancer"] = URI.join(node["mso-bpmn-urn-config"]["adaptersOpenecompDbEndpoint"], "/").to_s
node.default["mso-config"]["topology"]["jra-load-balancer"] = URI.join(node["mso-bpmn-urn-config"]["adaptersSdncEndpoint"], "/").to_s
node.default["mso-config"]["topology"]["camunda-load-balancer"] = URI.join(node["mso-api-handler-infra-config"]["camundaURL"], "/").to_s
diff --git a/templates/default/mso-bpmn-config/mso.bpmn.urn.properties b/templates/default/mso-bpmn-config/mso.bpmn.urn.properties
index 82fbc4e..4adb916 100644
--- a/templates/default/mso-bpmn-config/mso.bpmn.urn.properties
+++ b/templates/default/mso-bpmn-config/mso.bpmn.urn.properties
@@ -80,6 +80,7 @@ aai.endpoint=<%= @var["aaiEndpoint"] %>
mso.adapters.namespace=<%= @var["adaptersNamespace"] %>
mso.adapters.completemsoprocess.endpoint=<%= @var["adaptersCompletemsoprocessEndpoint"] %>
mso.adapters.db.endpoint=<%= @var["adaptersDbEndpoint"] %>
+mso.adapters.openecomp.db.endpoint=<%= @var["adaptersOpenecompDbEndpoint"] %>
mso.adapters.sdnc.endpoint=<%= @var["adaptersSdncEndpoint"] %>
mso.adapters.sdnc.rest.endpoint=<%= @var["adaptersSdncRestEndpoint"] %>
mso.adapters.tenant.endpoint=<%= @var["adaptersTenantEndpoint"] %>