diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-09-18 08:48:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-09-18 08:48:05 +0000 |
| commit | c54db5097f9ff70bf0ea9795aa05d1e174ffa764 (patch) | |
| tree | a6300a219afb768f79d65f9e0c38e9e100009c1e /kubernetes/onap/resources | |
| parent | dafa291f98366a0709c093e6fcc5f675f2451b3e (diff) | |
| parent | 955e39d2f87951cc12f5b9ec3d5a27054f9a8b03 (diff) | |
Merge "[OOM] Moving cert-service to platform"
Diffstat (limited to 'kubernetes/onap/resources')
| -rw-r--r-- | kubernetes/onap/resources/overrides/onap-all.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/onap/resources/overrides/oom-cert-service-environment.yaml (renamed from kubernetes/onap/resources/overrides/aaf-cert-service-environment.yaml) | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/kubernetes/onap/resources/overrides/onap-all.yaml b/kubernetes/onap/resources/overrides/onap-all.yaml index bfa0cdf8b8..1d0663ea65 100644 --- a/kubernetes/onap/resources/overrides/onap-all.yaml +++ b/kubernetes/onap/resources/overrides/onap-all.yaml @@ -1,5 +1,7 @@ # Copyright © 2019 Amdocs, Bell Canada # Copyright (c) 2020 Nordix Foundation, Modifications +# Modifications Copyright © 2020 Nokia +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -79,5 +81,7 @@ vnfsdk: enabled: true modeling: enabled: true +platform: + enabled: true a1policymanagement: enabled: true
\ No newline at end of file diff --git a/kubernetes/onap/resources/overrides/aaf-cert-service-environment.yaml b/kubernetes/onap/resources/overrides/oom-cert-service-environment.yaml index da00f61e2f..9914e1496e 100644 --- a/kubernetes/onap/resources/overrides/aaf-cert-service-environment.yaml +++ b/kubernetes/onap/resources/overrides/oom-cert-service-environment.yaml @@ -1,4 +1,5 @@ # Copyright © 2020 Nordix Foundation +# Modifications Copyright © 2020 Nokia # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -34,7 +35,7 @@ ################################################################# global: cmpv2Enabled: true - aaf: + platform: certServiceClient: envVariables: # Certificate related |