From: Krzysztof Opasiak <k.opasiak@samsung.com>
Date: Thu, 2 Jul 2020 17:26:56 +0000 (+0000)
Subject: Merge "[COMMON] Templates for services accounts and roles"
X-Git-Tag: 7.0.0~374
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=cc39379f8a7e42d122225af8fd7425a2a3b5325c;hp=4534881264e8a125c7eed68992fe4ef32b204caf;p=oom.git

Merge "[COMMON] Templates for services accounts and roles"
---

diff --git a/INFO.yaml b/INFO.yaml
index b440169e6b..553527bcbc 100644
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -4,11 +4,11 @@ project_creation_date: '2017-06-15'
 lifecycle_state: 'Incubation'
 project_category: ''
 project_lead: &onap_releng_ptl
-    name: 'Mike Elliott'
-    email: 'mike.elliott@amdocs.com'
-    id: 'melliott'
-    company: 'Amdocs'
-    timezone: 'Canada/Ontario'
+    name: 'Sylvain Desbureaux'
+    email: 'sylvain.desbureaux@orange.com'
+    id: 'sdesbure'
+    company: 'Orange'
+    timezone: 'Paris/France'
 primary_contact: *onap_releng_ptl
 issue_tracking:
     type: 'jira'
@@ -31,51 +31,16 @@ repositories:
     - 'oom'
 committers:
     - <<: *onap_releng_ptl
-    - name: 'Alexis de Talhouët'
-      email: 'adetalhouet89@gmail.com'
-      company: 'Bell Canada'
-      id: 'adetalhouet'
-      timezone: 'Canada/Montreal'
+    - name: 'Mike Elliott'
+      email: 'mike.elliott@amdocs.com'
+      id: 'melliott'
+      company: 'Amdocs'
+      timezone: 'Canada/Ontario'
     - name: 'Borislav Glozman'
       email: 'Borislav.Glozman@amdocs.com'
       company: 'Amdocs'
       id: 'BorislavG'
       timezone: 'Israel/Raanana'
-    - name: 'James MacNider'
-      email: 'James.MacNider@amdocs.com'
-      company: 'Amdocs'
-      id: 'jmac'
-      timezone: 'Canada/Ontario'
-    - name: 'Hong Guan'
-      email: 'hg4105@att.com'
-      company: 'ATT'
-      id: 'hg4105'
-      timezone: 'Not/Defined'
-    - name: 'Jun (Nicolas) Hu'
-      email: 'jh245g@att.com'
-      company: 'ATT'
-      id: 'jh245g'
-      timezone: 'America/New_York'
-    - name: 'Xue Gao'
-      email: 'xg353y@intl.att.com'
-      company: 'ATT'
-      id: 'xuegao'
-      timezone: 'Belgium/Namur'
-    - name: 'Brian Freeman'
-      email: 'bf1936@att.com'
-      company: 'ATT'
-      id: 'bdfreeman1421'
-      timezone: 'America/New_York'
-    - name: 'Yang Xu'
-      email: 'Yang.Xu3@huawei.com'
-      company: 'Huawei'
-      id: 'xuyang11'
-      timezone: 'America/New_York'
-    - name: 'Sylvain Desbureaux'
-      email: 'sylvain.desbureaux@orange.com'
-      company: 'Orange'
-      id: 'sdesbure'
-      timezone: 'Paris/France'
     - name: 'Krzysztof Opasiak'
       email: 'k.opasiak@samsung.com'
       company: 'Samsung'
diff --git a/kubernetes/aaf/components/aaf-cert-service/values.yaml b/kubernetes/aaf/components/aaf-cert-service/values.yaml
index 17b0b758cd..ad4b7c459b 100644
--- a/kubernetes/aaf/components/aaf-cert-service/values.yaml
+++ b/kubernetes/aaf/components/aaf-cert-service/values.yaml
@@ -47,7 +47,7 @@ service:
 
 # Deployment configuration
 repository: nexus3.onap.org:10001
-image: onap/org.onap.aaf.certservice.aaf-certservice-api:1.0.0
+image: onap/org.onap.aaf.certservice.aaf-certservice-api:1.1.0
 pullPolicy: Always
 replicaCount: 1
 
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index e48e3c6853..8a94369d39 100755
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -113,7 +113,7 @@ global:
   cmpv2Enabled: true
   aaf:
     certServiceClient:
-      image: onap/org.onap.aaf.certservice.aaf-certservice-client:1.0.0
+      image: onap/org.onap.aaf.certservice.aaf-certservice-client:1.1.0
       secret:
         name: aaf-cert-service-client-tls-secret
         mountPath: /etc/onap/aaf/certservice/certs/
@@ -127,6 +127,7 @@ global:
         # Client configuration related
         caName: "RA"
         requestURL: "https://aaf-cert-service:8443/v1/certificate/"
+        outputType: "P12"
         requestTimeout: "20000"
         keystorePath: "/etc/onap/aaf/certservice/certs/certServiceClient-keystore.jks"
         keystorePassword: "secret"