From a5445100050e49e83f73424198d73cd72d672a4d Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Sun, 4 Mar 2018 14:53:33 +0200 Subject: Sync Integ to Master Change-Id: I71e3acc26fa612127756ac04073a522b9cc6cd74 Issue-ID: SDC-977 Signed-off-by: Gitelman, Tal (tg851x) --- asdctool/src/main/resources/config/configuration.yaml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'asdctool/src/main/resources/config/configuration.yaml') diff --git a/asdctool/src/main/resources/config/configuration.yaml b/asdctool/src/main/resources/config/configuration.yaml index 48529a7c78..c92827e558 100644 --- a/asdctool/src/main/resources/config/configuration.yaml +++ b/asdctool/src/main/resources/config/configuration.yaml @@ -31,15 +31,12 @@ appVersion: 1.1.0 artifactGeneratorConfig: Artifact-Generator.properties resourcesForUpgrade: 5.0: - - org.openecomp.resource.cp.extCP - - tosca.nodes.network.Network - - tosca.nodes.network.Port - - org.openecomp.resource.cp.nodes.network.SubInterface + - tosca.nodes.Root skipUpgradeFailedVfs: true skipUpgradeVSPs: true autoHealingOwner: jh0003 -titanCfgFile: C:\Users\im453s\git\sdc\asdctool\src\main\resources\config\titan.properties +titanCfgFile: src\main\resources\config\titan.properties titanMigrationKeySpaceCfgFile: src\main\resources\config\titan-migration.properties titanInMemoryGraph: false titanLockTimeout: 1800 @@ -206,7 +203,6 @@ toscaArtifacts: type: TOSCA_CSAR description: TOSCA definition package of the asset - #Informational artifacts placeHolder excludeResourceCategory: - Generic @@ -333,7 +329,7 @@ serviceDeploymentArtifacts: - xml AAI_VF_INSTANCE_MODEL: acceptedTypes: - - xml + - xml OTHER: acceptedTypes: -- cgit 1.2.3-korg