summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorKrzysztof Opasiak <k.opasiak@samsung.com>2020-06-01 19:29:56 +0000
committerGerrit Code Review <gerrit@onap.org>2020-06-01 19:29:56 +0000
commit672d7f9a7c83bfceecc901d40e59513b95b6cb3a (patch)
tree6eb3ee9af1e17781a1d55f99dd5ca43f2fa43127 /kubernetes
parentb1023931a3c6cf6910114ce0acbbfbb25cb5aa04 (diff)
parent426b04e340b157413c43f55a6de7057dae246855 (diff)
Merge "Increment release version for osdf & has" into frankfurt
Diffstat (limited to 'kubernetes')
-rwxr-xr-xkubernetes/oof/charts/oof-has/resources/config/conductor.conf2
-rwxr-xr-xkubernetes/oof/charts/oof-has/values.yaml2
-rw-r--r--kubernetes/oof/resources/config/common_config.yaml3
-rw-r--r--kubernetes/oof/values.yaml4
4 files changed, 5 insertions, 6 deletions
diff --git a/kubernetes/oof/charts/oof-has/resources/config/conductor.conf b/kubernetes/oof/charts/oof-has/resources/config/conductor.conf
index 94a47fed2f..881ed22562 100755
--- a/kubernetes/oof/charts/oof-has/resources/config/conductor.conf
+++ b/kubernetes/oof/charts/oof-has/resources/config/conductor.conf
@@ -238,7 +238,7 @@ server_url = https://{{.Values.config.aai.serviceName}}.{{ include "common.names
#aai_retries = 3
# The version of A&AI in v# format. (string value)
-server_url_version = v14
+server_url_version = v19
# SSL/TLS certificate file in pem format. This certificate must be registered
# with the A&AI endpoint. (string value)
diff --git a/kubernetes/oof/charts/oof-has/values.yaml b/kubernetes/oof/charts/oof-has/values.yaml
index f4debe93fc..309b59ca86 100755
--- a/kubernetes/oof/charts/oof-has/values.yaml
+++ b/kubernetes/oof/charts/oof-has/values.yaml
@@ -25,7 +25,7 @@ global:
commonConfigPrefix: onap-oof-has
image:
readiness: oomk8s/readiness-check:2.0.0
- optf_has: onap/optf-has:2.0.3
+ optf_has: onap/optf-has:2.0.4
filebeat: docker.elastic.co/beats/filebeat:5.5.0
pullPolicy: Always
diff --git a/kubernetes/oof/resources/config/common_config.yaml b/kubernetes/oof/resources/config/common_config.yaml
index bfee39b967..9515f30fc0 100644
--- a/kubernetes/oof/resources/config/common_config.yaml
+++ b/kubernetes/oof/resources/config/common_config.yaml
@@ -44,8 +44,7 @@ osdf_temp: # special configuration required for "workarounds" or testing
slice_selection_policy_dir_urllc_1: "./test/policy-local-files/"
slice_selection_policy_files_urllc_1:
- vnfPolicy_URLLC_Core_1.json
- - thresholdPolicy_URLLC_Core_1_reliability.json
- - thresholdPolicy_URLLC_Core_1_latency.json
+ - thresholdPolicy_URLLC_Core_1.json
- subscriber_policy_URLLC_1.json
service_info:
diff --git a/kubernetes/oof/values.yaml b/kubernetes/oof/values.yaml
index 5205a1df1f..13e0045858 100644
--- a/kubernetes/oof/values.yaml
+++ b/kubernetes/oof/values.yaml
@@ -27,7 +27,7 @@ global:
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/optf-osdf:2.0.3
+image: onap/optf-osdf:2.0.4
pullPolicy: Always
# flag to enable debugging - application support required
@@ -49,7 +49,7 @@ config:
# Url and credentials for Conductor.
conductorUrl: https://oof-has-api:8091/v1/plans/
- conductorPingWaitTime: 60
+ conductorPingWaitTime: 10
conductorMaxRetries: 30
# versions to be set in HTTP header
conductorMinorVersion: 0