Merge "EDGEPOD-147 Add Intel Hillsboro Edge to Aether cluster"
diff --git a/deployment-configs/dt-berlin-pod.yaml b/deployment-configs/dt-berlin-pod.yaml
index b2583ce..6cd1ee0 100644
--- a/deployment-configs/dt-berlin-pod.yaml
+++ b/deployment-configs/dt-berlin-pod.yaml
@@ -63,9 +63,9 @@
       ip: 127.0.0.1
       user: community
       pass: admin
-      dp_iface_name: eno3
-      container_type: null
-      container_name: null
+      dp_iface_name: eth1
+      container_type: LXC
+      container_name: voltha-client
       onu: ALPHe3d1cf5c
       c_tag: 11
       s_tag: 11
diff --git a/kubernetes-configs/dt-berlin-pod.conf b/kubernetes-configs/dt-berlin-pod.conf
index 8c2e8cc..05fa11d 100755
--- a/kubernetes-configs/dt-berlin-pod.conf
+++ b/kubernetes-configs/dt-berlin-pod.conf
@@ -1,8 +1,8 @@
 apiVersion: v1
 clusters:
 - cluster:
-    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRJd01ERXlNVEUzTXpJek5Gb1hEVE13TURFeE9ERTNNekl6TkZvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTHp6CnY5bzdJRGc2eUY5d0dDUnpzNnpJNHQ2M0lGbmw0b0UvbzUvVDkyQ2ozSm9Vdit4K0xJdGJmN1crcm1SSzRYNEkKckFDbUVRUThYQUZhSHk4bWx4bG5JT3RydXVTL3AxWWhXYllERWdNanN3a0hOcWJtSjFQalhSVFF0RHdYSHZpTQpZZE40RWNuLzQ1bkl1M1NCQUF6bmZqV3BacEg2aGFiYTJTUjZOOHNDQ2Y1UmVMTVdtOXl0YStnT0M4TG9iclVlCjBObXJOdzBoM2MvQjZaMWJDOGd4cXlDaTVuVndMUE1qb0N6dkpqQXZpMXNpcjFhUmhxVUdGMUVHUzF3dmNhbW8KOFl6YmZJU1QwSW9ZWU9zSU9oelozc1laazAvOURXN2xUdHNBWnVlY3ExTFowb1IzY3dBWDJqZHRjbjBudDFvbgorVGpGbnhlUUpOMlphWmR2WU8wQ0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFIQ3ZXNDBEdTVWRFhRd2Fjb0Y5V0tGa2JHa08KQytiNlYweGtDLzN3TmFodHYycnl5blNQQ1kwOVAvakJaekFmeE1oTkJ1NldwRmhoemJBL2o5bjBlWnpoWW14Ugp4RWM3KzFqa2tlN2s2ODZIMlNsVXRLUm5uSjBBVVBzQVpXOVkrTFd4M1l0ZGhRa1c2dTRmSjA4VUZiM3BXN1JCCmFGNFZxMUpCaDNOcUlZRUIwRHNZOTBTSFNsZ0pUOS9FWDNZZndUYU85cElieStmYWgvR09jRUZCaXd0Ni80cFQKZ3VSZXVVbE9BQ2hnK3BRVG9pWmpROWhHa0wyYjF5V3BaakdHcUtFRXM4NTRwQ2gwMEE0REloUjNabDlWNjJVVQppaUZNQXR4eDI0M2srSVdUNDZqRkdsNjVBSEx3MlFMdDRKU2RjN01YSE5Hc3c4ZmIxZkZHN25iKzZjbz0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
-    server: https://127.0.0.1:45513
+    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRJd01ESXdOVEl5TlRJME5Wb1hEVE13TURJd01qSXlOVEkwTlZvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTnE3CkJWeTBrR1Q5bGV2Q1JpZTdmU2VOTm9HZmNpdlM5V1d6dmRoYityZnRWYVFZVExUaktTSFN1d2ZGTlFWdmFkUUMKczFvUVNtTytXSkprSkFaSWE4cGpLSFYrQTFuZjRqQkFwUkFlelZRb3UvcEZocjVGRkhVMkV6WlVLMmc2eGxsMAoyMlZvRlEvU09KbEFZYnJSVTY3ZUZQaC84cnRGZllQOUVPUEtqQmxNYWVBdlhzMkJpZTNNemYxZEdZS1p3MitGCi9wSlhFa3ltWTlZUWQ4YWdpNDY5WDlZNVphVkNWakRpbU1rVnFKSm5XWjZQUTJiTFdkYlZ3YlovaHJLaFZVZlcKT0lKS05yaDBndGhhUk9pYmg4Vzl4WlhPWGduVzFyNFNOS1lUUVZlNEJPOTZCbnlnQUE2ZU15TGFla25IZmhUawpDSVBCTmxtL0VGOWpYbnZlemtrQ0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFFRFBHNDRBbDlWeFkzOEZZb2FPTjU0bXhYM0kKZUFNY2hNRSt1VFdoZmZBNnIxT1FVL0d3SUUwZXVBbDdJa245RHl3ejhqYXhjTUx5WnJ2eDlCR1pleGFDZzljTwpqMkwrRDI4djYvWEZXRzdlcWVVdWJiQldNc0o0REhnNVF4bEwrTXJvcE9Ua3Y2RVFTeTEzVVJJaXBhV1VGUTZ0CnhhS0lFWDRMeWNiaEJRVVMzS1lTbldWeXloUGx6UmZCMGxaQTE4VC9sb1loSUdTWjBFbUVscG9VNEtFcXlkdFoKV2svSGowVlZGb1BHcVB2ajVPMFJHd05tcVNDTDZXSnB3NXI1MDg5QkFUM0d5TUxveTFHSEhQek5jbGI4ZHhYMgpKeFpqSVBYRC9MekptUGF2MGpSVWI2YUR5WHhDTmdZclA5cnNTUW1EdEFRWVRZZVNQTVAvSzk5WUtERT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    server: https://127.0.0.1:40845
   name: voltha-minimal
 contexts:
 - context:
@@ -15,5 +15,5 @@
 users:
 - name: kubernetes-admin
   user:
-    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJRmRLL1RxL0VyV2d3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TURBeE1qRXhOek15TXpSYUZ3MHlNVEF4TWpBeE56TXlNemxhTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQTVTUUVmQVUrWU1kR0o3aUoKVjJiWDd3YVNMTTU4WTBGVkVFSFcvbGpXaFRtMklWbUtmendFdFFhWG9SZ25ZVzRWcHRHWEppU0p2cEdoU2dUMQpKSkM0cnFhdmtzT1daZXUzU3hxVjN6TlZuQTF2Q01UQkcrTzBBNTk4enRnUzhOV1ZmS2sxcTRrYWdTckNIRU4vClh0UEVNODJPaTdhd08zRVRrZU9KUVo1cmtSbXBoQ3ppV0IrS0hkN1ZycnFtZzZYM0dUN0ZMU1lMTkQrY0ZvYXcKb2VpV1Y1UTArbUFldXhzelpWQ0p3alNETDVqei9nblM3Q2JqaHR6dW90OVlyeDN4bjJxS21VcmM4a2E4UWQ4RgptL1h6MWx6c29rdFZhcGkvb256NTFZMGZPbkt1TU0zNjM3L3FwMmtPYXNmZFB2TzFXVExuazFHOW9Hc0RwMDNxClJiVHZhd0lEQVFBQm95Y3dKVEFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFJY2Fpek4za0VGNjM4SFN2VnVrbEVvNi8vTHdobllEMlR5Uwp1YjdJbk9TS3A5S3dlN3IxT2U5LzFyTjVhcGtBN3NGK2M1V0M4V3E2clV1RGVHcGpIODZVVFpOUHdEM1ovYWZQCkJQSDgzRDFJRnd4Z2M1N2N2NXJ5aTI0eFNxVDBJS1FwTHdQa09xSWI1SmtWSFkrTHoxdEJQYW03YitJMjFCMk0KeWRNaCs4Y2w0UDdtcThVdEdaVmZRZmRyZjUySHZleDhOZEx6VjBPeHdHU3oxeER5YTIvdEtoeFl2YVhhSTNCLwpHTEFYTm1lK2J1bFNZZzcxSDFTd3laWUhIKzV4MG9MRkNnblNDb09wejk1TzV5bCs4eWZZU1dxSDNqaE1NWE9PCmt4WENiN0ZPZUVENUkxV292cjhsWnhzSWx0SEpPWVpKd1FmUW5tMDVtVU9vRGNpWTZhbz0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
-    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBNVNRRWZBVStZTWRHSjdpSlYyYlg3d2FTTE01OFkwRlZFRUhXL2xqV2hUbTJJVm1LCmZ6d0V0UWFYb1JnbllXNFZwdEdYSmlTSnZwR2hTZ1QxSkpDNHJxYXZrc09XWmV1M1N4cVYzek5WbkExdkNNVEIKRytPMEE1OTh6dGdTOE5XVmZLazFxNGthZ1NyQ0hFTi9YdFBFTTgyT2k3YXdPM0VUa2VPSlFaNXJrUm1waEN6aQpXQitLSGQ3VnJycW1nNlgzR1Q3RkxTWUxORCtjRm9hd29laVdWNVEwK21BZXV4c3paVkNKd2pTREw1anovZ25TCjdDYmpodHp1b3Q5WXJ4M3huMnFLbVVyYzhrYThRZDhGbS9YejFsenNva3RWYXBpL29uejUxWTBmT25LdU1NMzYKMzcvcXAya09hc2ZkUHZPMVdUTG5rMUc5b0dzRHAwM3FSYlR2YXdJREFRQUJBb0lCQUJWRXNaSGRYcnZXNDBFZQpsTWpqQjluc3p6YVBkK1l5a3pXdUZzbUc3MnB3UCtKNmtDdGRJOGExdE85RDhhdk9idjRMNkM2bko0M2pzSWZSClMvdTMzeHgrNWo4R0huaVpWMnNHTGJFSTc4SkxVT29NY1N3b2gzWHFvTWdHTUVQZ1h6Nng2Z1JnOW0vVXl5MmEKYWtFZ0FNOGFIa2dEamZvR2RkMk50QmkrSHBmYUQrNm8vR2c3VmtCWHl5UHh3STc2a081OGx6Ykx4MmQxRFlHUAppclBXaWNkRzR2ZTBzc2ovMGhLd05md3hEeW9jV1o3ckNYTXhOK21vdlY0ZnVpQmc5WDM2VTBTUUxBR0QvT2g0CitqTEFSR0t4VGl1eEpNNVBGU0VvTTdkaVNUQTdSWTJEWkZxdEZQRUVmMURLMmlkb0ptYmFjSDZOdk55QmlMTFgKN09qeXQyRUNnWUVBKzREb0xkZU82Z3FQU1RDRFd0amNwRWVvcklEZGc4anJKTm84N1BCSWswNlM5MkZFeFZ3NwpjK3Z3QmpQajJRVFdRd051V0pkOG1tRkRPeEp1VW8wbG9UeUZQU1hzenh6M1lNSVBMYUZUaHB3UFRKb0JWZ1pyCjB6VHNUNG0va1BOSFVoWHUzNUJwREtRZXhld1RhUXlWSjFwRXRUNWp5NW9TZld2cG9ZVEdESHNDZ1lFQTZUekMKWGRkUDFrQnNaZjhxM0FjOXBob0lxYmpUSlpyZHZ6ZGN1OFFYQ3Y4MmwrMjE4bWNPRkhhaEsxODRma1FJR1piMwpOT0cwVENQWTlBc2RJNVpmUWhTS3hMa0tjMFVnOW1TV2lkYnRYNWdVbXp3ZnVVMHp1UWhoU0kwZU5TblJMb2xZCmUrUVc5UHlmVW1vcEhVZ0hzMGhWSHVPV0RqWU5rREN0RHdUZmpkRUNnWUVBNlZRcGswWVZwNW9PWHVkc0pkOWwKcTk5elpEN1Z3OHFtSlBWM2FwWnRyb1JLSXNtUjVNdnh1RlVleEpKbGcxUlNkNjk2TXlTdmpBWktPa2FhSldvZgpqQnU2dlFVdlV1TGJ1bCt2ZHpUaGFkUGsrYnN6SEIwdThhNTZ3anZZaHVDOHZUSHVBR2xZbkVxeTVncGo0NlN4CngrV2VNc3ZrQitNejNqbzhjUVhlTzNzQ2dZQnVLL292ODUzTnViNjZhMDdtZ2pFWHZlSnJzVmRqd3dTTjUydlIKY2Uza2p1dE4xc2FFU3pPMmJOYnlzdGJ2cGRraHBWTCtVc01rMkNZS0dSblpqcFZPbEg5OEwyQUZWUmtkNmlQRgoxcFZuKzJGNGRtMFJ6YXJwODFCb3dlZ0wrc1hKc3F6dVVLNmJhSjBsZytvSjM5VnJWWGFIMGI4MjFVZVEzYjFSCmc5N0prUUtCZ0ZQUEY1T2VjWmtuZno4cFZQSzF2eDkvSUVhRDFpajZvRW02L1ZTUXlLaTFZeE9hai9jZWRSOXcKamYyUDBjWFltdDVVbHIrQjhtRWZVNzgxRzdZdUhCNWRPQXZJUmgyeHVFWnQxdWxkQ0FJeGlkQmdhdzlZc2dXcwpNOFdwczhyb2x0TFI2SDJvbDBON0NnRHBDcjVJdHBSYVZSenBVY243MFFzaGhCNGdzdXVlCi0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==
+    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJVjRFdERaK0VUNHN3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TURBeU1EVXlNalV5TkRWYUZ3MHlNVEF5TURReU1qVXlORFphTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQXg4ZHdGYWRCbCtaRStxdkMKREphVW0rRW9LdDNObmEwdGI5Qkg2c2w4MFlpUm9RWWQrankvbWVRNFhKMEQrWmpOalpGOGNOYnFHS1c1eHg1cwo5RmNhUjRVYnEyMkNhMWRISEtWV3IxN0VPQjYvdTJFYkdpNGxJMHRzTE9uaTVlRmJuTHhnMU41R2JJelF0R0RvCmxQTnFLeWpJOEdwSDhkUnhzdlUwZ0dXeGl5eXZrdEc3Q0pTYVBmdTBmN0JHcG1jMTFEZXF1QkJ2MVpWYjdJUWEKdFVkZllrck9vQ2JKbGNqNkFpL1A1U0E2c3lFS3lFTE9LUVl6RFVxR21XeWwwU3VJUUdzbUZnYmZRbE5mL2hiSworSVduTlQzdWc1NFZ2Sm5BRGpsclppblRCU3hrWjNUTmdOcjEyWHgwMytrdkJWaUJtMmlQTUNROC9OQVh1NmlqClArUnp0UUlEQVFBQm95Y3dKVEFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFLbzdRdkt3MHhVb1BpekIvZldic2NhQklLWmNhZFQvVWNvMgpSc0JEWU1uRkJ1RGlQamRHbFFYU0NEVXFWdVdKSG5CbXV3ZHZWMkhlc0MxTXlnNjNJSXBWRzJTM29FWkNvNTkrCnhFZDgvTldETHRsaDB1NTJ5TC9iSW94b1dybmx3SElEM2dSYlFkdERBU0dCWnNTUTNXU01SWHM3WTBkWk5sYU4KVGV0YlJyeTc1WXdxaGFORUZCS010VjF4Zmc1Q05KT09OcWNnM2FYanFTbkhjazR0MGhCVVpVOVZkQUUvTFR6SwpYdTdCMmRWbnM5NXNnWmdCWVphandXNXRpT3RPZTJwY2pBTWhNZ1pHZVFQbzEzU3ZmMEVaaG1DUy9wMm1wQ1AxCjhZdHp4TXFJQ1BERUtlY3A1cXlBbFZjM0ZsOXJvMkZjL2I5b0xmNjdlcmlveE14UTdYbz0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcGdJQkFBS0NBUUVBeDhkd0ZhZEJsK1pFK3F2Q0RKYVVtK0VvS3QzTm5hMHRiOUJINnNsODBZaVJvUVlkCitqeS9tZVE0WEowRCtaak5qWkY4Y05icUdLVzV4eDVzOUZjYVI0VWJxMjJDYTFkSEhLVldyMTdFT0I2L3UyRWIKR2k0bEkwdHNMT25pNWVGYm5MeGcxTjVHYkl6UXRHRG9sUE5xS3lqSThHcEg4ZFJ4c3ZVMGdHV3hpeXl2a3RHNwpDSlNhUGZ1MGY3QkdwbWMxMURlcXVCQnYxWlZiN0lRYXRVZGZZa3JPb0NiSmxjajZBaS9QNVNBNnN5RUt5RUxPCktRWXpEVXFHbVd5bDBTdUlRR3NtRmdiZlFsTmYvaGJLK0lXbk5UM3VnNTRWdkpuQURqbHJaaW5UQlN4a1ozVE4KZ05yMTJYeDAzK2t2QlZpQm0yaVBNQ1E4L05BWHU2aWpQK1J6dFFJREFRQUJBb0lCQVFDS2FiVlFhMGRZMUtOcQpBV0k2a29GMzFuR2I4WHlxQi9mNUJoY3RwbGVpWExwNUUrSGxJLzJqdzZrQkVaQlZkL2JDWk5BUTVmWGZDY05ECkgrTmhEcEFZaVRKNGZURGs2ZDFORFlpWGpGTHFodk5VQVoxamNDRXU2T3lUMlovb29WQjFzVlp0WldycGZrNkQKQ3JsWnFhUWZMdXk1RlFtdmxQOEpmRFhaMTV0QXpvUCsvYStoZVdaRlR6VWRjL0oyUWk2ZmNUNGxVN1lSVW9zWQptY2dFY0dOSFJ4cFZUT0hjdGJreWZXb0hLdUpjd2l0RGFKK3F2cmtORU5pUVcwQ3dOUEFFbVgzeDlHbDlneU5qCnUwMHFGMDdCcUtFbDNXb0hKV0hLRFZhcFpKcklyVEd1dWRacmg0ZU84aHRRNUViYXcwdVVheCtOYVpJd090WEwKSVhNMlFNMXBBb0dCQU13L0ZSdXJVTEZJai84T3RXQ3RwRGlsVHhvdGR6bVI1UEtLWDA0M204TzZBMGxDb1BzbAowWmhZcGRyb1JMNnpwazdpTDNhNU9RdExONExmZ0kxVzFuQ0p0RjBPUjVOTEprTjdDU3VzVzRrcms5eUEyckp2CnUzZ3BLOHFDcjA0T2l1SjVZL0lQNlQwQ3BPUCtVNU9ickdtcmpmTWxSbVFTbit2UG9MSXAxelVUQW9HQkFQcG0Ka2RDdDN6U0JFUElMM0o5azBQMG15bHZCU2NETHlabVg0V01ha0J0OEJNMkV1UDQ2UCtYem01Yjh3eE1LNWlrawp0dkNJL1dnWnMzUENIQlNmMzFqUUhFUS9KOXpVUzc1SXp2MTB0ZVB3S1ZEaUdzb0N0WVloWW80NzRDa2Z4Qm0wCnQvWXhDQ3FmZ3l5d0c0QVFBUm9HVFBMak05RnduWW1yMUZvWEgzVVhBb0dCQU1RckhubnB5K0hLWU10SGREdDcKNjB1Z3NsM2hKeTY3Q3B0TS9ZYWhjRkRIdXRwRlRWcUtrMGx3Y3pQU2ZCeHhiWjA4THZ3bm9EdFJyZXBjQWhzKwpPVTN6WkxFdnd0MGNnNDZ5Z0RkYkhydWJpRE56NnhrUXFZMGFkZjNXRU11MnVmd1ZQVUpEdCsrcU4zYm5VWnhuCkcyeU9vaExUVFUxV2VoVEI0WVRkSE43VEFvR0JBTmluNE9pL1dJNTBVallyLzBQSEZuRERuSG1SbjMvNms3K2EKdzRCZFhtejVmS3BhZVRvM0treUw0SWJld3ViNkdqVmxPQWlkYnkwZ2Q3M2tLU25MUHBQNDFVeFRuT2tjbzBETQpmSlNlNURhSitTV3J6V1FXdmZ1RmJXSUYrcWw2ZTlHR0pWb1dDS3ZnZ3I0cXpsQ2JDR2o5SkoxUDZ1ai8yTDlpCjlvVFExdjRYQW9HQkFKRlN2NkxGRjBDcDJ1SFZVbkhlazVsRS8ydDNSV0hSR21KaUlWQmNkenp6S0M0OW1hTHMKeVlLY3RkRzRwQ0daMExGUHBmZEpKR0k0KzhHWlpObE52Ui85UVpRakRhYnd1WTNwQjUzdExzcytXdFhrVm1mYwoyWkFYNG85SzVPSUZKd3lmTHZkVXBncWVlL1BlOVMwNCtKMjZUcHg0TVdmT0dPVmFtNlIvaXVWZQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
\ No newline at end of file
diff --git a/kubernetes-configs/voltha/onf-demo-pod.yml b/kubernetes-configs/voltha/onf-demo-pod.yml
index 51e7fd6..c5e57fe 100644
--- a/kubernetes-configs/voltha/onf-demo-pod.yml
+++ b/kubernetes-configs/voltha/onf-demo-pod.yml
@@ -1,11 +1,10 @@
----
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2019 Ciena Corporation
 #
 # 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
+#     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,
@@ -13,12 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Automated deployment configuration for ONF DEMO POD, olt/onu are connected to this
-
 defaults:
   image_tag: master
   image_pullPolicy: Always
 
+images:
+  onos:
+    repository: matteoscandolo/voltha-onos
+    tag: 1.13.10
+
 deployments:
   etcdOperator: true
   backupOperator: false
@@ -37,3 +39,8 @@
     fieldPath: metadata.namespace
 - name: ONOS_APPS
   value: "drivers,openflow-base,hostprovider"
+
+# Customization for BBSIM
+kafka_broker: 'voltha-kafka.voltha.svc.cluster.local:9092'
+pon_ports: 1
+onus_per_pon_port: 1