diff options
4 files changed, 10 insertions, 6 deletions
diff --git a/kubernetes/contrib/components/ejbca/resources/ejbca-config.sh b/kubernetes/contrib/components/ejbca/resources/ejbca-config.sh index 94c95d6c30..a538238151 100755 --- a/kubernetes/contrib/components/ejbca/resources/ejbca-config.sh +++ b/kubernetes/contrib/components/ejbca/resources/ejbca-config.sh @@ -49,6 +49,8 @@ configureEjbca() { ejbca.sh roles changerule "Certificate Update Admin" /endentityprofilesrules/Custom_EndEntity/ ACCEPT ejbca.sh roles changerule "Certificate Update Admin" /ra_functionality/edit_end_entity/ ACCEPT ejbca.sh roles addrolemember "Certificate Update Admin" ManagementCA WITH_ORGANIZATION --value "{{ .Values.cmpv2Config.global.certificate.default.subject.organization }}" + # workarround to exit successfully, as a reexecution of "addrolemember" returns an error + exit 0 } diff --git a/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml index b012ee4942..a5a6870906 100644 --- a/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml +++ b/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml @@ -1,6 +1,6 @@ #============LICENSE_START======================================================== #================================================================================= -# Copyright (c) 2018-2021 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2018-2022 AT&T Intellectual Property. All rights reserved. # Modifications Copyright © 2018 Amdocs, Bell Canada # Copyright (c) 2021 J. F. Lucas. All rights reserved. # ================================================================================ @@ -104,7 +104,7 @@ mongo: disableNfsProvisioner: true # application image -image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:3.3.5 +image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:3.3.6 default_k8s_location: central # DCAE component images to be deployed via Cloudify Manager diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/values.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/values.yaml index e54608b30e..665e833f43 100644 --- a/kubernetes/dcaemod/components/dcaemod-runtime-api/values.yaml +++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/values.yaml @@ -1,6 +1,6 @@ #============LICENSE_START======================================================== #================================================================================= -# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2019-2022 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -71,7 +71,7 @@ readiness: # Should have a proper readiness endpoint or script # application image -image: onap/org.onap.dcaegen2.platform.mod.runtime-web:1.2.3 +image: onap/org.onap.dcaegen2.platform.mod.runtime-web:1.2.4 # Resource Limit flavor -By Default using small flavor: small diff --git a/kubernetes/oof/resources/config/conf/slicing_config.yaml b/kubernetes/oof/resources/config/conf/slicing_config.yaml index e456aeccdf..97ed73d524 100644 --- a/kubernetes/oof/resources/config/conf/slicing_config.yaml +++ b/kubernetes/oof/resources/config/conf/slicing_config.yaml @@ -21,6 +21,7 @@ attribute_mapping: uLThptPerUE: ul_thpt_per_ue sNSSAI: s_nssai pLMNIdList: plmn_id_list + plmnIdList: plmn_id_List activityFactor: activity_factor coverageAreaTAList: coverage_area_ta_list availability: availability @@ -34,7 +35,7 @@ attribute_mapping: maxPktSize: max_pkt_size msgSizeByte: msg_size_byte maxNumberofConns: max_number_of_conns - maxNumberofPDUSessions: max_number_of_pdu_sessions + maxNumberofPDUSession: max_number_of_pdu_session termDensity: terminal_density survivalTime: survival_time areaTrafficCapDL: area_traffic_cap_dl @@ -64,6 +65,7 @@ attribute_mapping: ul_thpt_per_ue: uLThptPerUE s_nssai: sNSSAI plmn_id_list: pLMNIdList + plmn_id_List: plmnIdList activity_factor: activityFactor coverage_area_ta_list: coverageAreaTAList availability: availability @@ -77,7 +79,7 @@ attribute_mapping: max_pkt_size: maxPktSize msg_size_byte: msgSizeByte max_number_of_conns: maxNumberofConns - max_number_of_pdu_sessions: maxNumberofPDUSessions + max_number_of_pdu_session: maxNumberofPDUSession terminal_density: termDensity survival_time: survivalTime area_traffic_cap_dl: areaTrafficCapDL |