Merge changes I36641bbb,Ia8568265

* changes:
  parameterize docker image
  add service endpoint annotation for aai

5 files changed, 132 insertions, 10 deletions

diff --git a/kubernetes/aai/templates/all-services.yaml b/kubernetes/aai/templates/all-services.yaml
index 93fbf1999c..ac709d997b 100644
--- a/kubernetes/aai/templates/all-services.yaml
+++ b/kubernetes/aai/templates/all-services.yaml
@@ -32,6 +32,123 @@ metadata:
   namespace: "{{ .Values.nsPrefix }}-aai"
   labels:
     app: aai-service
+  annotations:
+    msb.onap.org/service-info: '[
+      {
+          "serviceName": "aai-cloudInfrastructure",
+          "version": "v1",
+          "url": "/cloud-infrastructure",
+          "protocol": "REST"
+          "port": "8443",
+          "enable_ssl":"True"
+          "visualRange":"1"
+      },
+      {
+          "serviceName": "aai-cloudInfrastructure-deprecated",
+          "version": "v1",
+          "url": "/cloud-infrastructure",
+          "protocol": "REST"
+          "port": "8443",
+          "enable_ssl":"True"
+          "visualRange":"1"
+          "path":"/cloud-infrastructure"
+      },
+      {
+          "serviceName": "aai-business",
+          "version": "v1",
+          "url": "/business",
+          "protocol": "REST"
+          "port": "8443",
+          "enable_ssl":"True"
+          "visualRange":"1"
+      },
+      {
+          "serviceName": "aai-business-deprecated",
+          "version": "v1",
+          "url": "/business",
+          "protocol": "REST"
+          "port": "8443",
+          "enable_ssl":"True"
+          "visualRange":"1"
+          "path":"/business"
+      },
+      {
+          "serviceName": "aai-search",
+          "version": "v1",
+          "url": "/search",
+          "protocol": "REST"
+          "port": "8443",
+          "enable_ssl":"True"
+          "visualRange":"1"
+      },
+      {
+          "serviceName": "aai-search-deprecated",
+          "version": "v1",
+          "url": "/search",
+          "protocol": "REST"
+          "port": "8443",
+          "enable_ssl":"True"
+          "visualRange":"1"
+          "path":"/search"
+      },
+      {
+          "serviceName": "aai-actions",
+          "version": "v1",
+          "url": "/actions",
+          "protocol": "REST"
+          "port": "8443",
+          "enable_ssl":"True"
+          "visualRange":"1"
+      },
+      {
+          "serviceName": "aai-actions-deprecated",
+          "version": "v1",
+          "url": "/actions",
+          "protocol": "REST"
+          "port": "8443",
+          "enable_ssl":"True"
+          "visualRange":"1"
+          "path":"/actions"
+      },
+      {
+          "serviceName": "aai-service-design-and-creation",
+          "version": "v1",
+          "url": "/service-design-and-creation",
+          "protocol": "REST"
+          "port": "8443",
+          "enable_ssl":"True"
+          "visualRange":"1"
+      },
+      {
+          "serviceName": "aai-service-design-and-creation-deprecated",
+          "version": "v1",
+          "url": "/service-design-and-creation",
+          "protocol": "REST"
+          "port": "8443",
+          "enable_ssl":"True"
+          "visualRange":"1"
+          "path":"/service-design-and-creation"
+      },
+      {
+          "serviceName": "aai-network",
+          "version": "v1",
+          "url": "/network",
+          "protocol": "REST"
+          "port": "8443",
+          "enable_ssl":"True"
+          "visualRange":"1"
+      },
+      {
+          "serviceName": "aai-network-deprecated",
+          "version": "v1",
+          "url": "/network",
+          "protocol": "REST"
+          "port": "8443",
+          "enable_ssl":"True"
+          "visualRange":"1"
+          "path":"/network"
+      }             
+      ]'
 spec:
   ports:
   - name: "aai-service-port-8443"
diff --git a/kubernetes/msb/templates/msb-consul-deployment.yaml b/kubernetes/msb/templates/msb-consul-deployment.yaml
index 1dbbe8fb1b..de33961f8a 100644
--- a/kubernetes/msb/templates/msb-consul-deployment.yaml
+++ b/kubernetes/msb/templates/msb-consul-deployment.yaml
@@ -16,8 +16,8 @@ spec:
       hostname: msb-consul
       containers:
       - args:
-        image: consul
-        name: "msb-consul"
+        image: {{ .Values.image.consul }}
+        name: msb-consul
         ports:
         - containerPort: {{ .Values.consulPort }}
           name: msb-consul
@@ -26,4 +26,4 @@ spec:
             port: {{ .Values.consulPort }}
           initialDelaySeconds: 5
           periodSeconds: 10
-        imagePullPolicy: "{{ .Values.pullPolicy }}"
\ No newline at end of file
+        imagePullPolicy: {{ .Values.pullPolicy }}
\ No newline at end of file
diff --git a/kubernetes/msb/templates/msb-discovery-deployment.yaml b/kubernetes/msb/templates/msb-discovery-deployment.yaml
index 0fcd2f9ba9..b54f3d1d20 100644
--- a/kubernetes/msb/templates/msb-discovery-deployment.yaml
+++ b/kubernetes/msb/templates/msb-discovery-deployment.yaml
@@ -16,7 +16,7 @@ spec:
       hostname: msb-discovery
       containers:
       - args:
-        image:  nexus3.onap.org:10001/onap/msb/msb_discovery
+        image:  {{ .Values.image.discovery }}
         name: "msb-discovery"
         env:
         - name: CONSUL_IP
@@ -29,6 +29,6 @@ spec:
             port: {{ .Values.discoveryPort }}
           initialDelaySeconds: 5
           periodSeconds: 10
-        imagePullPolicy: "{{ .Values.pullPolicy }}"
+        imagePullPolicy: {{ .Values.pullPolicy }}
 
 
diff --git a/kubernetes/msb/templates/msb-eag-deployment.yaml b/kubernetes/msb/templates/msb-eag-deployment.yaml
index eb75cd9e42..c4697baeed 100644
--- a/kubernetes/msb/templates/msb-eag-deployment.yaml
+++ b/kubernetes/msb/templates/msb-eag-deployment.yaml
@@ -16,7 +16,7 @@ spec:
       hostname: msb-eag
       containers:
       - args:
-        image:  nexus3.onap.org:10001/onap/msb/msb_apigateway
+        image:  {{ .Values.image.apigateway }}
         name: "msb-eag"
         env:
         - name: CONSUL_IP
@@ -33,6 +33,6 @@ spec:
             port: {{ .Values.eagPort }}
           initialDelaySeconds: 5
           periodSeconds: 10
-        imagePullPolicy: "{{ .Values.pullPolicy}}"
+        imagePullPolicy: {{ .Values.pullPolicy}}
 
 
diff --git a/kubernetes/msb/values.yaml b/kubernetes/msb/values.yaml
index 38059e1458..6927f1da6e 100644
--- a/kubernetes/msb/values.yaml
+++ b/kubernetes/msb/values.yaml
@@ -1,3 +1,10 @@
+nsPrefix: onap
+pullPolicy: IfNotPresent
+image:
+  consul: consul:latest
+  discovery: nexus3.onap.org:10001/onap/msb/msb_discovery:latest
+  apigateway: nexus3.onap.org:10001/onap/msb/msb_discovery:latest
+
 consulClusterIP: 10.43.6.204
 consulPort: 8500
 consulNodePort: 30500
@@ -15,6 +22,4 @@ iagReplicas: 1
 eagClusterIP: 10.43.6.207
 eagPort: 80
 eagNodePort: 30082
-eagReplicas: 1
-
-pullPolicy: IfNotPresent
\ No newline at end of file
+eagReplicas: 1
\ No newline at end of file