Run all components in one namespace

Change-Id: I5fcd4d577c1fda4de27842807c7cf7a5d372756e
Issue-ID: OOM-722
Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>

4 files changed, 18 insertions, 18 deletions

diff --git a/kubernetes/sdc/resources/config/environments/AUTO.json b/kubernetes/sdc/resources/config/environments/AUTO.json
index 5d6eaef94e..d35590ec67 100755
--- a/kubernetes/sdc/resources/config/environments/AUTO.json
+++ b/kubernetes/sdc/resources/config/environments/AUTO.json
@@ -8,34 +8,34 @@
    "chef_type": "environment",
 
    "default_attributes": {
-        "CS_VIP": "sdc-cs.onap-sdc",
-        "BE_VIP": "sdc-be.onap-sdc",
-        "FE_VIP": "sdc-fe.onap-sdc",
-        "ES_VIP": "sdc-es.onap-sdc",
+        "CS_VIP": "sdc-cs.{{.Values.nsPrefix}}",
+        "BE_VIP": "sdc-be.{{.Values.nsPrefix}}",
+        "FE_VIP": "sdc-fe.{{.Values.nsPrefix}}",
+        "ES_VIP": "sdc-es.{{.Values.nsPrefix}}",
         "interfaces": {
             "application": "eth0",
             "private": "eth0"
         },
                 "ECompP": {
-                    "ecomp_rest_url": "http://portalapps.onap-portal:8989/ONAPPORTAL/auxapi",
-            "ueb_url_list": "dmaap.onap-message-router, dmaap.onap-message-router",
+                    "ecomp_rest_url": "http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/auxapi",
+            "ueb_url_list": "dmaap.{{.Values.nsPrefix}}, dmaap.{{.Values.nsPrefix}}",
             "app_secret": "XftIATw9Jr3VzAcPqt3NnJOu",
             "app_key": "x9UfO7JsDn8BESVX",
             "inbox_name": "ECOMP-PORTAL-INBOX",
-            "ecomp_redirect_url": "http://portalapps.onap-portal:8989/ONAPPORTAL/login.htm",
+            "ecomp_redirect_url": "http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/login.htm",
             "app_topic_name": "ECOMP-PORTAL-OUTBOX-SDC1",
                         "decryption_key": "AGLDdG4D04BKm2IxIWEr8o=="
         },
         "UEB": {
             "PublicKey": "iPIxkpAMI8qTcQj8",
             "SecretKey": "Ehq3WyT4bkif4zwgEbvshGal",
-            "fqdn": ["dmaap.onap-message-router", "dmaap.onap-message-router"]
+            "fqdn": ["dmaap.{{.Values.nsPrefix}}", "dmaap.{{.Values.nsPrefix}}"]
         },
         "Nodes": {
-            "CS": "sdc-cs.onap-sdc",
-            "BE": "sdc-be.onap-sdc",
-            "FE": "sdc-fe.onap-sdc",
-            "ES": "sdc-es.onap-sdc"
+            "CS": "sdc-cs.{{.Values.nsPrefix}}",
+            "BE": "sdc-be.{{.Values.nsPrefix}}",
+            "FE": "sdc-fe.{{.Values.nsPrefix}}",
+            "ES": "sdc-es.{{.Values.nsPrefix}}"
         }
     },
     "override_attributes": {
diff --git a/kubernetes/sdc/resources/config/environments/Template.json b/kubernetes/sdc/resources/config/environments/Template.json
index ddddc78e2b..247e990f31 100755
--- a/kubernetes/sdc/resources/config/environments/Template.json
+++ b/kubernetes/sdc/resources/config/environments/Template.json
@@ -17,19 +17,19 @@
             "private": "eth1"
         },
 		"ECompP": {
-		    "ecomp_rest_url": "http://portalapps.onap-portal:8989/ONAPPORTAL/auxapi",
-            "ueb_url_list": "dmaap.onap-message-router,dmaap.onap-message-router", 
+		    "ecomp_rest_url": "http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/auxapi",
+            "ueb_url_list": "dmaap.{{.Values.nsPrefix}},dmaap.{{.Values.nsPrefix}}", 
             "app_secret": "XftIATw9Jr3VzAcPqt3NnJOu", 
             "app_key": "x9UfO7JsDn8BESVX", 
             "inbox_name": "ECOMP-PORTAL-INBOX", 
-            "ecomp_redirect_url": "http://portalapps.onap-portal:8989/ONAPPORTAL/login.htm", 
+            "ecomp_redirect_url": "http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/login.htm", 
             "app_topic_name": "ECOMP-PORTAL-OUTBOX-SDC1",
 			"decryption_key": "AGLDdG4D04BKm2IxIWEr8o=="
         }, 
         "UEB": {
             "PublicKey": "iPIxkpAMI8qTcQj8",
             "SecretKey": "Ehq3WyT4bkif4zwgEbvshGal",
-            "fqdn": ["dmaap.onap-message-router", "dmaap.onap-message-router"]
+            "fqdn": ["dmaap.{{.Values.nsPrefix}}", "dmaap.{{.Values.nsPrefix}}"]
         },
         "Nodes": {
             "CS": "yyy",
diff --git a/kubernetes/sdc/resources/config/log/filebeat/filebeat.yml b/kubernetes/sdc/resources/config/log/filebeat/filebeat.yml
index f316b866af..89c6932577 100644
--- a/kubernetes/sdc/resources/config/log/filebeat/filebeat.yml
+++ b/kubernetes/sdc/resources/config/log/filebeat/filebeat.yml
@@ -21,7 +21,7 @@ output.logstash:
   #List of logstash server ip addresses with port number.
   #But, in our case, this will be the loadbalancer IP address.
   #For the below property to work the loadbalancer or logstash should expose 5044 port to listen the filebeat events or port in the property should be changed appropriately.
-  hosts: ["logstash.onap-log:5044"]
+  hosts: ["logstash.{{.Values.nsPrefix}}:5044"]
   #If enable will do load balancing among availabe Logstash, automatically.
   loadbalance: true
 
diff --git a/kubernetes/sdc/resources/config/sdc-fe/FE_2_setup_configuration.rb b/kubernetes/sdc/resources/config/sdc-fe/FE_2_setup_configuration.rb
index 9fc662ee0a..5c233a2207 100755
--- a/kubernetes/sdc/resources/config/sdc-fe/FE_2_setup_configuration.rb
+++ b/kubernetes/sdc/resources/config/sdc-fe/FE_2_setup_configuration.rb
@@ -7,7 +7,7 @@ template "catalog-fe-config" do
    mode "0755"
    variables({
       :fe_host_ip   => node['HOST_IP'],
-      :be_host_ip   => "sdc-be.onap-sdc",
+      :be_host_ip   => "sdc-be.{{.Values.nsPrefix}}",
       :catalog_port => node['BE'][:http_port],
       :ssl_port     => node['BE'][:https_port]
    })