diff options
author | Alexis de Talhouƫt <adetalhouet89@gmail.com> | 2019-02-15 12:29:42 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-02-15 12:29:42 +0000 |
commit | 4a022a730d4b58fdee8a93ba212fbe7d7b689ecf (patch) | |
tree | 5fb121c228e4a8b4ce11d1797135c8875013a927 /kubernetes/pomba/charts/pomba-networkdiscovery | |
parent | 972277427c97e27dca3a1c8623c7446e502347ee (diff) | |
parent | 1153c39b565b50b3e4a28ec86d5d9635e8a51dc1 (diff) |
Merge "Network Disc chart update for SDNC-637"
Diffstat (limited to 'kubernetes/pomba/charts/pomba-networkdiscovery')
-rw-r--r-- | kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties | 3 | ||||
-rw-r--r-- | kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties b/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties index a5aeb71ec1..f09dc05980 100644 --- a/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties +++ b/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties @@ -30,9 +30,10 @@ openstack.identity.url ={{ .Values.config.openstackIdentityUrl }} openstack.identity.user ={{ .Values.config.openstackUserId }} openstack.identity.password ={{ .Values.config.openstackPassword }} -openstack.types = vserver, l3-network +openstack.types = vserver, l3-network, port openstack.type.vserver.url = {{ .Values.config.openstackTypeVserverUrl }} openstack.type.l3-network.url = {{ .Values.config.openstackTypeL3NetworkUrl }} +openstack.type.port.url = {{ .Values.config.openstackTypePortUrl }} openstack.api.microversion = 2.42 diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml b/kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml index fdc44298e2..95099d0d3e 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.1-latest +image: onap/network-discovery:1.5.0-SNAPSHOT-latest pullPolicy: Always # flag to enable debugging - application support required @@ -55,6 +55,7 @@ config: # 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} + openstackTypePortUrl: http://10.69.36.11:9696/v2.0/ports/{0} # default number of instances replicaCount: 1 |