From 7d79d1126137be3559815f00fb7a316eadd759e4 Mon Sep 17 00:00:00 2001 From: Norm Traxler Date: Thu, 29 Nov 2018 19:23:56 +0000 Subject: Network Discovery OOM changes Issue-ID: SDNC-533 Change Pomba OOM install to use latest Network Discovery code. Change-Id: I8f2b07f1ab8180ca74d935e55f11e9705f283148 Signed-off-by: Norm Traxler --- .../resources/config/application.properties | 27 ++++++++------------- .../resources/config/auth/client-cert-onap.p12 | Bin 0 -> 2556 bytes .../resources/config/auth/enricher-client-cert.p12 | Bin 2605 -> 0 bytes .../templates/deployment.yaml | 4 +-- .../charts/pomba-networkdiscovery/values.yaml | 19 ++++++++++++--- 5 files changed, 27 insertions(+), 23 deletions(-) create mode 100644 kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/client-cert-onap.p12 delete mode 100644 kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/enricher-client-cert.p12 (limited to 'kubernetes/pomba/charts/pomba-networkdiscovery') diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties b/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties index 274a872856..a59cf41b33 100644 --- a/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties +++ b/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties @@ -35,20 +35,13 @@ server.context_parameters.p-name=value #context parameter with p-name as key and basicAuth.username={{ .Values.config.networkDiscoveryUserId }} basicAuth.password={{ .Values.config.networkDiscoveryPassword }} -enricher.types = vserver, l3-network -enricher.type.vserver.url = /enricher/v11/cloud-infrastructure/vservers/vserver/{0}?sot=!aai -enricher.type.l3-network.url = /enricher/v11/network/l3-networks/l3-network/{0}?sot=!aai - -# Mapping from Enricher Attribute name to POMBA Attribute name in the format -# :; and separated by semicolon ";" -# for example, -# vserser-id:id; -# means Attribute name "vserver-id" from Enricher will be converted to "id" in POMBA. -enricher.attributeNameMappingList=Id:id;id:id;vserver-id:id;name:name;locked:inMaintenance; \ - hostname:hostName;status:status;vm_state:vmState;vm-state:vmState;admin_state_up:adminState; \ - favor.disk:flavorDisk;flavor.ephemeral:flavorEphemoral;flavor.extra_specs.hw.cpu_model:flavorHwCpuModel; \ - flavor.extra_specs.hw.cpu_policy:flavorHwCpuPolicy;flavor.extra_specs.hw.mem_page_size:flavorHwMemPageSize; \ - flavor.original_name:flavorOriginalName;flavor.ram:flavorRam;flavor.swap:flavorSwag;flavorvcpus:flavorVcpus; \ - image.id:imageId;hostId:hostId;host:host;host_status:hostStatus;security_group.name:securityGroupName; \ - serverName:serverName;metadata.myservername:otherServerName;shared:sharedNetwork;subnets:subnets; \ - userId:userId;tenant_id:tenantId +openstack.identity.url ={{ .Values.config.openstackIdentityUrl }} +openstack.identity.user ={{ .Values.config.openstackUserId }} +openstack.identity.password ={{ .Values.config.openstackPassword }} + +openstack.types = vserver, l3-network +openstack.type.vserver.url = {{ .Values.config.openstackTypeVserverUrl }} +openstack.type.l3-network.url = {{ .Values.config.openstackTypeL3NetworkUrl }} + +openstack.api.microversion = 2.42 + diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/client-cert-onap.p12 b/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/client-cert-onap.p12 new file mode 100644 index 0000000000..dbf4fcacec Binary files /dev/null and b/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/client-cert-onap.p12 differ diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/enricher-client-cert.p12 b/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/enricher-client-cert.p12 deleted file mode 100644 index 12e0ae94fa..0000000000 Binary files a/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/enricher-client-cert.p12 and /dev/null differ diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/templates/deployment.yaml b/kubernetes/pomba/charts/pomba-networkdiscovery/templates/deployment.yaml index 7f44106bf9..91b4c5a254 100644 --- a/kubernetes/pomba/charts/pomba-networkdiscovery/templates/deployment.yaml +++ b/kubernetes/pomba/charts/pomba-networkdiscovery/templates/deployment.yaml @@ -64,9 +64,9 @@ spec: name: {{ include "common.fullname" . }}-config subPath: application.properties readOnly: true - - mountPath: /opt/app/config/auth/enricher-client-cert.p12 + - mountPath: /opt/app/config/auth/client-cert-onap.p12 name: {{ include "common.fullname" . }}-auth-secret - subPath: enricher-client-cert.p12 + subPath: client-cert-onap.p12 readOnly: true resources: diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml b/kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml index 0e42192c44..35369e7ba8 100644 --- a/kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml +++ b/kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml @@ -24,7 +24,7 @@ global: ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/network-discovery:1.4.2 +image: onap/network-discovery:latest pullPolicy: Always # flag to enable debugging - application support required @@ -38,6 +38,15 @@ config: networkDiscoveryUserId: admin networkDiscoveryPassword: OBF:1u2a1toa1w8v1tok1u30 + # Basic Authorization credentials for Openstack Rest APIs + openstackIdentityUrl: http://10.69.36.11:5000/v3/auth/tokens + openstackUserId: admin + openstackPassword: OBF:1w951ugg1vun1uha1w8l + + # Openstack Rest API URLs: + openstackTypeVserverUrl: http://10.69.36.11:8774/v2.1/servers/{0} + openstackTypeL3NetworkUrl: http://10.69.36.11:9696/v2.0/networks/{0} + # default number of instances replicaCount: 1 @@ -66,9 +75,11 @@ service: #Services may use any combination of ports depending on the 'type' of #service being defined. - type: ClusterIP - externalPort: 9531 + type: NodePort + name: pomba-networkdiscovery + externalPort: 8080 internalPort: 8080 + nodePort: 99 # nodePort: # optional port name override - default can be defined in service.yaml #portName: http @@ -94,4 +105,4 @@ resources: requests: cpu: 20m memory: 800Mi - unlimited: {} \ No newline at end of file + unlimited: {} -- cgit 1.2.3-korg