X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fpolicy%2Ftemplates%2Fall-services.yaml;h=f8e435b1bc3ae361c0efee41b9306b95a5551c59;hb=1e5ca467cadaa2d398d448c414075089a3998b7b;hp=5ad5aa5d308f7fa2a2ac36a3809a8824d1a33adf;hpb=78eff21978e9252c1128ff2f4820d43a08b2b0a7;p=oom.git

diff --git a/kubernetes/policy/templates/all-services.yaml b/kubernetes/policy/templates/all-services.yaml
index 5ad5aa5d30..f8e435b1bc 100644
--- a/kubernetes/policy/templates/all-services.yaml
+++ b/kubernetes/policy/templates/all-services.yaml
@@ -1,8 +1,23 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#{{ if not .Values.disablePolicyMariadb }}
 apiVersion: v1
 kind: Service
 metadata:
   name: mariadb
-  namespace: "{{ .Values.nsPrefix }}-policy"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: mariadb
 spec:
@@ -12,6 +27,8 @@ spec:
   selector:
     app: mariadb
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disablePolicyNexus }}
 ---
 apiVersion: v1
 kind: Service
@@ -19,7 +36,7 @@ metadata:
   labels:
     app: nexus
   name: nexus
-  namespace: "{{ .Values.nsPrefix }}-policy"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   ports:
   - name: nexus-port
@@ -27,6 +44,8 @@ spec:
   selector:
     app: nexus
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disablePolicyDrools }}
 ---
 apiVersion: v1
 kind: Service
@@ -34,21 +53,26 @@ metadata:
   labels:
     app: drools
   name: drools
-  namespace: "{{ .Values.nsPrefix }}-policy"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   ports:
   - name: "drools-port"
     port: 6969
     nodePort: {{ .Values.nodePortPrefix }}17
+  - name: "drools-port2"
+    port: 9696
+    nodePort: {{ .Values.nodePortPrefix }}21
   selector:
     app: drools
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disablePolicyPap }}
 ---
 apiVersion: v1
 kind: Service
 metadata:
   name: pap
-  namespace: "{{ .Values.nsPrefix }}-policy"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: pap
 spec:
@@ -62,12 +86,14 @@ spec:
   selector:
     app: pap
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disablePolicyPdp }}
 ---
 apiVersion: v1
 kind: Service
 metadata:
   name: pdp
-  namespace: "{{ .Values.nsPrefix }}-policy"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: pdp
   annotations:
@@ -76,14 +102,16 @@ metadata:
           "serviceName": "policy-pdp",
           "version": "v1",
           "url": "/pdp",
-          "protocol": "REST"
+          "protocol": "REST",
+          "port": "8081",
           "visualRange":"1"
       },
       {
           "serviceName": "policy-pdp-deprecated",
           "version": "v1",
           "url": "/pdp",
-          "protocol": "REST"
+          "protocol": "REST",
+          "port": "8081",
           "visualRange":"1",
           "path":"/pdp"
       }
@@ -96,28 +124,14 @@ spec:
   selector:
     app: pdp
   type: NodePort
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: pypdp
-  namespace: "{{ .Values.nsPrefix }}-policy"
-  labels:
-    app: pypdp
-spec:
-  ports:
-  - name: tcp-31032-8480-bm91k
-    port: 8480
-    nodePort: {{ .Values.nodePortPrefix }}21
-  selector:
-    app: pypdp
-  type: NodePort
+#{{ end }}
+#{{ if not .Values.disablePolicyBrmsgw }}
 ---
 apiVersion: v1
 kind: Service
 metadata:
   name: brmsgw
-  namespace: "{{ .Values.nsPrefix }}-policy"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: brmsgw
 spec:
@@ -128,3 +142,4 @@ spec:
   selector:
     app: brmsgw
   type: NodePort
+#{{ end }}