diff options
| author |   Jorge Hernandez <jh1730@att.com> | 2017-05-03 21:31:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-05-03 21:31:58 +0000 |
| commit | a330af579866dacbe595e2e4ad1dd29cd3c96945 (patch) | |
| tree | b9455591600034dfd4f33a9c1f733336280f2208 /packages/base/src/files/install/servers/console | |
| parent | 5444e748b8651d8346dcb78c5ab8b0637dea197b (diff) | |
| parent | e0addf5b588a1244f9679becd90999dfcb4c3a94 (diff) | |
Merge "Policy 1707 commit to LF"
Diffstat (limited to 'packages/base/src/files/install/servers/console')
5 files changed, 8 insertions, 5 deletions
diff --git a/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml b/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml index 1e8b6cf48..38405d625 100755 --- a/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml +++ b/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml @@ -90,4 +90,4 @@ </AdviceExpression> </AdviceExpressions> </Rule> -</Policy> +</Policy>
\ No newline at end of file diff --git a/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml b/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml index 86defdf44..25af35a78 100755 --- a/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml +++ b/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml @@ -90,4 +90,4 @@ </AdviceExpression> </AdviceExpressions> </Rule> -</Policy> +</Policy>
\ No newline at end of file diff --git a/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_MS_vFirewall.1.xml b/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_MS_vFirewall.1.xml index 6492b50ee..336504c71 100644 --- a/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_MS_vFirewall.1.xml +++ b/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_MS_vFirewall.1.xml @@ -111,4 +111,4 @@ </AdviceExpression> </AdviceExpressions> </Rule> -</Policy> +</Policy>
\ No newline at end of file diff --git a/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_MS_vLoadBalancer.1.xml b/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_MS_vLoadBalancer.1.xml index 0de9067a2..bb183c5a0 100644 --- a/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_MS_vLoadBalancer.1.xml +++ b/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_MS_vLoadBalancer.1.xml @@ -111,4 +111,4 @@ </AdviceExpression> </AdviceExpressions> </Rule> -</Policy> +</Policy>
\ No newline at end of file diff --git a/packages/base/src/files/install/servers/console/bin/xacml.admin.properties b/packages/base/src/files/install/servers/console/bin/xacml.admin.properties index 8a214a8ab..dbbcc59fb 100644 --- a/packages/base/src/files/install/servers/console/bin/xacml.admin.properties +++ b/packages/base/src/files/install/servers/console/bin/xacml.admin.properties @@ -154,7 +154,6 @@ xacml.rest.pdp.idfile=${{POLICY_HOME}}/servers/pap/bin/test.properties xacml.rest.closedLoopFault=OpenSource.version.1 xacml.rest.closedLoopPM=OpenSource.version.1 xacml.rest.microServices=OpenSource.version.1 -xacml.rest.gocPolicy=OpenSource.version.1 xacml.rest.firewallPolicy=OpenSource.version.1 #***Properties for IntegrityMonitor integration defined in XACMLRestProperties.java*** @@ -201,3 +200,7 @@ ecomp.application.name = ${{ecomp_application_name}} #Dialect for Database ecomp.dialect = org.hibernate.dialect.MySQLDialect + +#Micro Service Model Properties +xacml.policy.msEcompName=${{policy_msEcompName}} +xacml.policy.msPolicyName=${{policy_msPolicyName}}
\ No newline at end of file |