summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2019-08-02 13:23:15 +0000
committerGerrit Code Review <gerrit@onap.org>2019-08-02 13:23:15 +0000
commit728d68a941b94b95ca99d98bbbf39749d89bf129 (patch)
tree7af37d4c538f6541dc46ab32f02405d810b3c364
parent5475d42040e512913fbaffa9221ad81033714887 (diff)
parent1fb42820911f03d23c0487b91957c5f472d70d41 (diff)
Merge "removing unused aai property"
-rw-r--r--.gitignore2
-rw-r--r--resources/config/eteshare/config/vm_properties.py5
2 files changed, 4 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index d8fe4fa..97a5360 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
/.project
+/.pydevproject
+*.pyc \ No newline at end of file
diff --git a/resources/config/eteshare/config/vm_properties.py b/resources/config/eteshare/config/vm_properties.py
index bdd9b1d..eebde10 100644
--- a/resources/config/eteshare/config/vm_properties.py
+++ b/resources/config/eteshare/config/vm_properties.py
@@ -15,8 +15,7 @@
# File generated from /opt/config
#
GLOBAL_INJECTED_AAF_IP_ADDR = 'aaf-service.{{include "common.namespace" .}}'
-GLOBAL_INJECTED_AAI1_IP_ADDR = 'aai.{{include "common.namespace" .}}'
-GLOBAL_INJECTED_AAI2_IP_ADDR = 'N/A'
+GLOBAL_INJECTED_AAI_IP_ADDR = 'aai.{{include "common.namespace" .}}'
GLOBAL_INJECTED_APPC_IP_ADDR = 'appc.{{include "common.namespace" .}}'
GLOBAL_INJECTED_APPC_CDT_IP_ADDR = 'appc-cdt.{{include "common.namespace" .}}'
GLOBAL_INJECTED_ARTIFACTS_VERSION = '{{.Values.demoArtifactsVersion}}'
@@ -121,7 +120,7 @@ GLOBAL_INJECTED_VNFSDK_IP_ADDR = 'refrepo.{{include "common.namespace" .}}'
GLOBAL_INJECTED_PROPERTIES = {
"GLOBAL_INJECTED_AAF_IP_ADDR" : 'aaf-service.{{include "common.namespace" .}}',
- "GLOBAL_INJECTED_AAI1_IP_ADDR" : 'aai.{{include "common.namespace" .}}',
+ "GLOBAL_INJECTED_AAI_IP_ADDR" : 'aai.{{include "common.namespace" .}}',
"GLOBAL_INJECTED_AAI2_IP_ADDR" : 'N/A',
"GLOBAL_INJECTED_APPC_IP_ADDR" : 'appc.{{include "common.namespace" .}}',
"GLOBAL_INJECTED_APPC_CDT_IP_ADDR" : 'appc-cdt.{{include "common.namespace" .}}',