diff options
| -rw-r--r-- | blueprints/k8s-hv-ves.yaml-template | 37 | ||||
| -rw-r--r-- | blueprints/k8s-policy_handler.yaml-template | 2 | ||||
| -rw-r--r-- | blueprints/policy_handler.yaml-template | 2 | ||||
| -rw-r--r-- | input-templates/phinputs.yaml | 1 |
4 files changed, 11 insertions, 31 deletions
diff --git a/blueprints/k8s-hv-ves.yaml-template b/blueprints/k8s-hv-ves.yaml-template index 01c14a8..8572c39 100644 --- a/blueprints/k8s-hv-ves.yaml-template +++ b/blueprints/k8s-hv-ves.yaml-template @@ -42,27 +42,12 @@ inputs: type: integer description: Network port that the platform service exposes in the container default: 6061 - consul_host: - type: string - description: Consul endpoint address - default: 'consul-server.onap' - consul_port: - type: integer - description: Consul endpoint port - default: 8500 kafka_bootstrap_servers: type: string default: 'message-router-kafka:9092' - perf3gpp_domain: - type: string - default: 'perf3gpp' perf3gpp_kafka_topic: type: string default: 'HV_VES_PERF3GPP' - healthcheck_port: - type: integer - description: Network port that the HV-Ves HTTP service for performing healthcheck is running - default: 6060 node_templates: hv-ves: interfaces: @@ -70,21 +55,15 @@ node_templates: start: inputs: envs: - JAVA_OPTS: '-Dlogback.configurationFile=/etc/ONAP/dcae-hv-ves-collector/logback.xml' - VESHV_CONFIG_URL: - { concat: [ 'http://', { get_input: consul_host }, ':', { get_input: consul_port }, '/v1/kv/', { get_input: hv_ves_name}, '?raw=true' ] } - VESHV_LISTEN_PORT: - { concat: [ { get_input: container_port }, '' ] } - VESHV_HEALTH_CHECK_API_PORT: - { concat: [ { get_input: healthcheck_port }, '' ] } - VESHV_KAFKA_BOOTSTRAP_SERVERS: - { get_input: kafka_bootstrap_servers } - VESHV_SSL_DISABLE: '' + JAVA_OPTS: { concat: [ '-Dlogback.configurationFile=/etc/ONAP/', { get_input: hv_ves_name }, '/logback.xml' ] } properties: application_config: - collector.routing: - - fromDomain: { get_input: perf3gpp_domain } - toTopic: { get_input: perf3gpp_kafka_topic } + streams_publishes: + perf3gpp: + type: kafka + kafka_info: + bootstrap_servers: { get_input: kafka_bootstrap_servers } + topic_name: { get_input: perf3gpp_kafka_topic } docker_config: healthcheck: type: script @@ -98,5 +77,5 @@ node_templates: container_port: { get_input: container_port } host_port: { get_input: host_port } log_info: - log_directory: '/var/log/ONAP/dcae-hv-ves-collector' + log_directory: { concat: [ '/var/log/ONAP/', { get_input: hv_ves_name } ] } type: dcae.nodes.ContainerizedPlatformComponent diff --git a/blueprints/k8s-policy_handler.yaml-template b/blueprints/k8s-policy_handler.yaml-template index 6667390..3b2e071 100644 --- a/blueprints/k8s-policy_handler.yaml-template +++ b/blueprints/k8s-policy_handler.yaml-template @@ -32,7 +32,7 @@ inputs: policy_handler_image: description: Docker image for policy_handler - default: '{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.policy-handler:4.6.0' + default: '{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.policy-handler:5.0.0' application_config: description: policy handler application configuration - requires info on policy-engine diff --git a/blueprints/policy_handler.yaml-template b/blueprints/policy_handler.yaml-template index 51976a0..29e66e6 100644 --- a/blueprints/policy_handler.yaml-template +++ b/blueprints/policy_handler.yaml-template @@ -39,7 +39,7 @@ inputs: policy_handler_image: description: Docker image for policy_handler - default: '{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.policy-handler:4.6.0' + default: '{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.policy-handler:5.0.0' application_config: description: policy handler application configuration - requires info on policy-engine diff --git a/input-templates/phinputs.yaml b/input-templates/phinputs.yaml index 4078208..bbdab63 100644 --- a/input-templates/phinputs.yaml +++ b/input-templates/phinputs.yaml @@ -53,6 +53,7 @@ application_config: # related to policy-engine itself. policy_engine : url : "http://{{ policy_ip_addr }}:8081" + path_decision : "/decision/v1" path_notifications : "/pdp/notifications" path_api : "/pdp/api/" headers : |