Deploying ONF-Demo-POD with same software as ONLAB-pod1

Change-Id: Id4c5531af597b398b2c138ebf6d7547e186be850
diff --git a/kubernetes-configs/onf-demo-pod.yml b/kubernetes-configs/onf-demo-pod.yml
index ed134fd..2e7e908 100644
--- a/kubernetes-configs/onf-demo-pod.yml
+++ b/kubernetes-configs/onf-demo-pod.yml
@@ -1,54 +1,71 @@
 ---
+# Copyright 2017-present Open Networking Foundation
+#
+# 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.
 
-etcd-cluster:
-  clusterSize: 1
-# global:
-#    registry: 192.168.100.1:30500/
+# Automated deployment configuration for Flex POD 1 , olt/onu are connected to this
+
+# This file is used to optionally customize helm charts installations
 images:
 # VOLTHA
- envoy_for_etcd:
-   repository: '192.168.100.1:30500/voltha/voltha-envoy'
-   tag: 'dev'
+  envoy_for_etcd:
+    tag: 'voltha-1.7'
 
- netconf:
-   repository: '192.168.100.1:30500/voltha/voltha-netconf'
-   tag: 'dev'
+  netconf:
+    tag: 'voltha-1.7'
 
- ofagent:
-   repository: '192.168.100.1:30500/voltha/voltha-ofagent'
-   tag: 'dev'
+  ofagent:
+    tag: 'voltha-1.7'
 
- vcli:
-   repository: '192.168.100.1:30500/voltha/voltha-cli'
-   tag: 'dev'
+  vcli:
+    tag: 'voltha-1.7'
 
- vcore:
-   repository: '192.168.100.1:30500/voltha/voltha-voltha'
-   tag: 'dev'
-# BBSIM
- bbsim:
-   repository: voltha/voltha-bbsim
-   tag: latest
+  vcore:
+    #repository: '10.90.0.101:30500/voltha/voltha-voltha'
+    tag: 'voltha-1.7'
+    #tag: 'dev'
+
 # ONOS
- onos:
-   repository: 'onosproject/onos'
-   tag: '1.13.9-rc4'
+  onos:
+    repository: 'matteoscandolo/onos'
+    tag: '1.13-branch'
+    #tag: '1.13.9-rc4'
+
+volt:
+  image:
+    tag: 'master'
 
 rcord:
- image:
-   tag: 'master'
+  image:
+    #repository: '10.90.0.101:30500/xosproject/rcord-synchronizer'
+    #tag: 'candidate'
+    tag: 'master'
 
 att-workflow-driver:
- image:
-   tag: 'master'
+  image:
+    tag: 'master'
+    #repository: '10.90.0.101:30500/xosproject/att-workflow-driver-synchronizer'
+    #tag: 'candidate'
 
 sadis-server:
- image:
-   repository: opencord/sadis-server
-   tag: latest
+  image:
+    repository: opencord/sadis-server
+    tag: latest
 
 # ONOS applications
-aaaAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=aaa-app&v=1.9.0-SNAPSHOT&e=oar"
+#aaaAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=aaa-app&v=1.9.0-SNAPSHOT&e=oar"
+#using older aaa-app version due to bug
+aaaAppUrl: "https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/1.9.0-SNAPSHOT/aaa-app-1.9.0-20190521.071409-20.oar"
 aaaAppVersion: "1.9.0.SNAPSHOT"
 
 sadisAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=sadis-app&v=3.1.0-SNAPSHOT&e=oar"
@@ -62,3 +79,10 @@
 
 kafkaAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=kafka&v=1.1.0-SNAPSHOT&e=oar"
 kafkaAppVersion: "1.1.0.SNAPSHOT"
+
+application_logs: |
+  log4j.logger.org.opencord.olt = DEBUG
+  log4j.logger.org.opencord.kafka = DEBUG
+  log4j.logger.org.opencord.sadis = DEBUG
+  log4j.logger.org.opencord.aaa = DEBUG
+  log4j.logger.org.opencord.dhcpl2relay = DEBUG