summaryrefslogtreecommitdiffstats
path: root/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config
diff options
context:
space:
mode:
authorNorm Traxler <normant@amdocs.com>2018-11-29 19:23:56 +0000
committerNorm Traxler <normant@amdocs.com>2018-11-29 21:11:29 +0000
commit7d79d1126137be3559815f00fb7a316eadd759e4 (patch)
tree61760bbcc691e39cb679ad0ba98bd3fa7c3f596c /kubernetes/pomba/charts/pomba-networkdiscovery/resources/config
parent742aeba08119ed5ba5af643a518506b48d17a724 (diff)
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 <normant@amdocs.com>
Diffstat (limited to 'kubernetes/pomba/charts/pomba-networkdiscovery/resources/config')
-rw-r--r--kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties27
-rw-r--r--kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/client-cert-onap.p12bin0 -> 2556 bytes
-rw-r--r--kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/enricher-client-cert.p12bin2605 -> 0 bytes
3 files changed, 10 insertions, 17 deletions
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
-# <Enricher Attribute Name>:<Pomba Attribute Name>; 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
--- /dev/null
+++ b/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/client-cert-onap.p12
Binary files 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
--- a/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/enricher-client-cert.p12
+++ /dev/null
Binary files differ