From 43c67e08c6ea24689a6d06a56b601a827a6e912e Mon Sep 17 00:00:00 2001
From: Alexis de Talhouët <adetalhouet89@gmail.com>
Date: Thu, 20 Sep 2018 16:49:16 -0400
Subject: Add missing properties files to SDNC
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Missing netbox and blueprint-rest-adaptor

Change-Id: Ifa4f2095190718ae8dc3412eac99ae242978c97e
Issue-ID: CCSDK-589
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
---
 .../resources/config/application.properties                    | 10 ++++++----
 .../common/controller-blueprints/resources/config/logback.xml  |  3 ++-
 .../common/controller-blueprints/templates/deployment.yaml     | 10 ++++++++++
 kubernetes/common/controller-blueprints/templates/secrets.yaml |  2 ++
 kubernetes/common/controller-blueprints/values.yaml            |  2 ++
 5 files changed, 22 insertions(+), 5 deletions(-)

(limited to 'kubernetes/common/controller-blueprints')

diff --git a/kubernetes/common/controller-blueprints/resources/config/application.properties b/kubernetes/common/controller-blueprints/resources/config/application.properties
index ec3a1ffce7..48678fcef8 100644
--- a/kubernetes/common/controller-blueprints/resources/config/application.properties
+++ b/kubernetes/common/controller-blueprints/resources/config/application.properties
@@ -18,7 +18,9 @@ appName=ControllerBluePrints
 ms_name=org.onap.ccsdk.apps.controllerblueprints
 appVersion=1.0.0
 
-#logging.pattern.console=%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr($ threadId: {PID:- }){magenta} %clr(---){faint} %clr([ hostname: %X{hostname} serviceName: %X{serviceName} version: %X{version} transactionId: %X{transactionId} requestTimeStamp: %X{requestTimestamp}  responseTimeStamp: %X{responseTimestamp} duration: %X{duration}]){yellow} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wex
+# Basic Authentication
+basic-auth.user-name=ccsdkapps
+basic-auth.hashed-pwd=$2a$10$MJxhNiOAffxbyrV9.rrOUewP9Q/ASg5Nit2cmP.yBaXGsVXo8BW3y
 
 logging.level.org.springframework.web=INFO
 logging.level.org.hibernate.SQL=warn
@@ -28,9 +30,9 @@ logging.level.org.hibernate.type.descriptor.sql=debug
 spring.jackson.default-property-inclusion=non_null
 
 #Swagger Configuration
-swagger.contact.name=Brinda Santh Muthuramalingam
-swagger.contact.url=www.onap.com
-swagger.contact.email=brindasanth@onap.com
+swagger.contact.name=CCSDK team
+swagger.contact.url=www.onap.org
+swagger.contact.email=onap-discuss@lists.onap.org
 
 spring.jpa.properties.hibernate.show_sql=true
 spring.jpa.properties.hibernate.use_sql_comments=true
diff --git a/kubernetes/common/controller-blueprints/resources/config/logback.xml b/kubernetes/common/controller-blueprints/resources/config/logback.xml
index 9129fcf150..b73db7145f 100644
--- a/kubernetes/common/controller-blueprints/resources/config/logback.xml
+++ b/kubernetes/common/controller-blueprints/resources/config/logback.xml
@@ -33,6 +33,7 @@
 
     <logger name="org.springframework" level="info"/>
     <logger name="org.springframework.web" level="info"/>
+    <logger name="org.springframework.security.web.authentication" level="warn"/>
     <logger name="org.hibernate" level="error"/>
     <logger name="org.onap.ccsdk.apps" level="info"/>
 
@@ -40,4 +41,4 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/kubernetes/common/controller-blueprints/templates/deployment.yaml b/kubernetes/common/controller-blueprints/templates/deployment.yaml
index fc7329cf9f..18fb16561a 100644
--- a/kubernetes/common/controller-blueprints/templates/deployment.yaml
+++ b/kubernetes/common/controller-blueprints/templates/deployment.yaml
@@ -81,6 +81,16 @@ spec:
                 secretKeyRef:
                   name: {{ template "common.fullname" . }}
                   key: db-root-password
+            - name: MS_USER
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "common.fullname" . }}
+                  key: restUser
+            - name: MS_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "common.fullname" . }}
+                  key: restPassword
             - name: INIT_DATA_LOAD
               value: {{ .Values.config.initDataLoad | quote }}
             - name: STICKYSELECTORKEY
diff --git a/kubernetes/common/controller-blueprints/templates/secrets.yaml b/kubernetes/common/controller-blueprints/templates/secrets.yaml
index 4b11188429..b4ab161809 100644
--- a/kubernetes/common/controller-blueprints/templates/secrets.yaml
+++ b/kubernetes/common/controller-blueprints/templates/secrets.yaml
@@ -25,3 +25,5 @@ metadata:
 type: Opaque
 data:
   db-root-password: {{ index .Values "mariadb-galera" "config" "mariadbRootPassword" | b64enc | quote }}
+  restUser: {{ .Values.config.restUser | b64enc | quote }}
+  restPassword: {{ .Values.config.restPassword | b64enc | quote }}
diff --git a/kubernetes/common/controller-blueprints/values.yaml b/kubernetes/common/controller-blueprints/values.yaml
index a08ab121ee..f8b8aba9f4 100644
--- a/kubernetes/common/controller-blueprints/values.yaml
+++ b/kubernetes/common/controller-blueprints/values.yaml
@@ -53,6 +53,8 @@ config:
   initDataLoad: true
   stickySelectorKey:
   envContext: DEV
+  restUser: ccsdkapps
+  restPassword: ccsdkapps
 
 mariadb-galera:
   config:
-- 
cgit 1.2.3-korg