diff options
author | Rob Daugherty <rd472p@att.com> | 2017-10-27 21:29:52 -0400 |
---|---|---|
committer | Rob Daugherty <rd472p@att.com> | 2017-10-27 21:31:48 -0400 |
commit | 5339f514a5ddc43b39d37880d56301fab8b2962d (patch) | |
tree | 31b6eb0377585895bc6b5bc7d9482c619e095d19 | |
parent | 4e7f7cb51316cc3c5e70fa0eef1d0a34bf2f5a30 (diff) |
Fix SNIRO configuration properties
This is the definitive set:
"sniroAuth": "test:testpwd",
"sniroEndpoint": "http://sniro.api.simpledemo.openecomp.org:8080/sniro/api/v2/placement",
"sniroTimeout": "PT30M",
"serviceAgnosticSniroHost": "http://sniro.api.simpledemo.openecomp.org:8080",
"serviceAgnosticSniroEndpoint": "/sniro/api/v2/placement",
Issue: SO-274
Change-Id: I3d4485089e3a7de76906aecbc06554155d0ad677
Signed-off-by: Rob Daugherty <rd472p@att.com>
-rw-r--r-- | attributes/mso-bpmn-urn-config.rb | 5 | ||||
-rw-r--r-- | templates/default/mso-bpmn-config/mso.bpmn.urn.properties | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/attributes/mso-bpmn-urn-config.rb b/attributes/mso-bpmn-urn-config.rb index d134c8e..76a2c9b 100644 --- a/attributes/mso-bpmn-urn-config.rb +++ b/attributes/mso-bpmn-urn-config.rb @@ -6,11 +6,10 @@ node.default["mso-bpmn-config"]["urnFileSystemLoadingEnabled"] = "true" #### node.default["mso-bpmn-urn-config"]["infraCustomerId"] = "DefaultRecipe_infraCustomerId" node.default["mso-bpmn-urn-config"]["sniroAuth"] = "DefaultRecipe_sniroAuth" -node.default["mso-bpmn-urn-config"]["sniroCallback"] = "DefaultRecipe_sniroCallback" node.default["mso-bpmn-urn-config"]["sniroEndpoint"] = "DefaultRecipe_sniroEndpoint" node.default["mso-bpmn-urn-config"]["sniroTimeout"] = "DefaultRecipe_sniroTimeout" -node.default["mso-bpmn-urn-config"]["sniroPoliciesDHV2vvig"] = "DefaultRecipe_sniroPoliciesDHV2vvig" -node.default["mso-bpmn-urn-config"]["sniroPoliciesDHV4vvig"] = "DefaultRecipe_sniroPoliciesDHV4vvig" +node.default["mso-bpmn-urn-config"]["serviceAgnosticSniroHost"] = "DefaultRecipe_serviceAgnosticSniroHost" +node.default["mso-bpmn-urn-config"]["serviceAgnosticSniroEndpoint"] = "DefaultRecipe_serviceAgnosticSniroEndpoint" node.default["mso-bpmn-urn-config"]["catalogDbEndpoint"] = "DefaultRecipe_catalogDbEndpoint" node.default["mso-bpmn-urn-config"]["aaiEndpoint"] = "DefaultRecipe_sdncauth" node.default["mso-bpmn-urn-config"]["aaiAuth"] = "DefaultRecipe_aaiAuth" diff --git a/templates/default/mso-bpmn-config/mso.bpmn.urn.properties b/templates/default/mso-bpmn-config/mso.bpmn.urn.properties index 4adb916..7a73227 100644 --- a/templates/default/mso-bpmn-config/mso.bpmn.urn.properties +++ b/templates/default/mso-bpmn-config/mso.bpmn.urn.properties @@ -73,8 +73,8 @@ mso.infra.customer.id=<%= @var["infraCustomerId"] %> mso.sniro.auth=<%= @var["sniroAuth"] %> mso.sniro.endpoint=<%= @var["sniroEndpoint"] %> mso.sniro.timeout=<%= @var["sniroTimeout"] %> -mso.sniro.policies.dhv.2vvig=<%= @var["sniroPoliciesDHV2vvig"] %> -mso.sniro.policies.dhv.4vvig=<%= @var["sniroPoliciesDHV4vvig"] %> +mso.service.agnostic.sniro.host=<%= @var["serviceAgnosticSniroHost"] %> +mso.service.agnostic.sniro.endpoint=<%= @var["serviceAgnosticSniroEndpoint"] %> mso.catalog.db.endpoint=<%= @var["catalogDbEndpoint"] %> aai.endpoint=<%= @var["aaiEndpoint"] %> mso.adapters.namespace=<%= @var["adaptersNamespace"] %> |