move policy config to onap 1.1

was the cause of the robot failure for policy in oom

Issue-ID: OOM-297

Change-Id: Iabb24cc7a007ef852cde3ebe2cbb9226bb4153b3
Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
Signed-off-by: Ahmed Alabulrahman <ahmed.alabdulrahman@amdocs.com>

4 files changed, 6 insertions, 31 deletions

diff --git a/kubernetes/policy/templates/all-services.yaml b/kubernetes/policy/templates/all-services.yaml
index cd01b54ee8..0d9a68ac25 100644
--- a/kubernetes/policy/templates/all-services.yaml
+++ b/kubernetes/policy/templates/all-services.yaml
@@ -102,22 +102,6 @@ spec:
 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
----
-apiVersion: v1
-kind: Service
-metadata:
   name: brmsgw
   namespace: "{{ .Values.nsPrefix }}-policy"
   labels:
diff --git a/kubernetes/policy/templates/dep-maria.yaml b/kubernetes/policy/templates/dep-maria.yaml
index 30d0db3af5..368d6381c8 100644
--- a/kubernetes/policy/templates/dep-maria.yaml
+++ b/kubernetes/policy/templates/dep-maria.yaml
@@ -4,7 +4,6 @@ metadata:
   name: mariadb
   namespace: "{{ .Values.nsPrefix }}-policy"
 spec:
-  replicas: 1
   selector:
     matchLabels:
       app: mariadb
@@ -15,11 +14,7 @@ spec:
     spec:
       hostname: mariadb
       containers:
-      - command:
-        - /bin/bash
-        - -c
-        - exec bash /tmp/do-start.sh
-        image: "{{ .Values.image.policyDb }}:{{ .Values.image.policyDbVersion }}"
+      - image: "{{ .Values.image.policyDb }}:{{ .Values.image.policyDbVersion }}"
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: mariadb
         ports:
diff --git a/kubernetes/policy/templates/dep-nexus.yaml b/kubernetes/policy/templates/dep-nexus.yaml
index de067b162f..f777d0cabd 100644
--- a/kubernetes/policy/templates/dep-nexus.yaml
+++ b/kubernetes/policy/templates/dep-nexus.yaml
@@ -40,11 +40,7 @@ spec:
           ]'
     spec:
       containers:
-      - command:
-        - /bin/bash
-        - -c
-        - bash -c "/opt/nexus/nexus-2.14.2-01/bin/nexus start && sleep 1000d"
-        image: "{{ .Values.image.policyNexus }}:{{ .Values.image.policyNexusVersion }}"
+      - image: "{{ .Values.image.policyNexus }}:{{ .Values.image.policyNexusVersion }}"
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: nexus
       imagePullSecrets:
diff --git a/kubernetes/policy/values.yaml b/kubernetes/policy/values.yaml
index 1b2ed0f880..62e91f88f5 100644
--- a/kubernetes/policy/values.yaml
+++ b/kubernetes/policy/values.yaml
@@ -4,12 +4,12 @@ nodePortPrefix: 302
 image:
   readiness: oomk8s/readiness-check
   readinessVersion: 1.0.0
-  policyPe: nexus3.onap.org:10001/openecomp/policy/policy-pe
+  policyPe: nexus3.onap.org:10001/onap/policy/policy-pe
   policyPeVersion: 1.1-STAGING-latest
-  policyDrools: nexus3.onap.org:10001/openecomp/policy/policy-drools
+  policyDrools: nexus3.onap.org:10001/onap/policy/policy-drools
   policyDroolsVersion: 1.1-STAGING-latest
-  policyDb: nexus3.onap.org:10001/openecomp/policy/policy-db
+  policyDb: nexus3.onap.org:10001/onap/policy/policy-db
   policyDbVersion: 1.1-STAGING-latest
-  policyNexus: nexus3.onap.org:10001/openecomp/policy/policy-nexus
+  policyNexus: nexus3.onap.org:10001/onap/policy/policy-nexus
   policyNexusVersion: 1.1-STAGING-latest
   ubuntu: ubuntu:16.04