Merge "updates to flex ocp pod"
diff --git a/deployment-configs/flex-ocp-cord-voltha-master.yaml b/deployment-configs/flex-ocp-cord-voltha-master.yaml
index 8dca321..a8fbf10 100644
--- a/deployment-configs/flex-ocp-cord-voltha-master.yaml
+++ b/deployment-configs/flex-ocp-cord-voltha-master.yaml
@@ -48,17 +48,17 @@
hosts:
src:
- ip: '10.192.4.61'
- user: 'cluser'
- pass: 'cloudlabs'
- dp_iface_name: 'enp4s0f1'
+ ip: '10.192.20.61'
+ user: 'cord'
+ pass: 'cord'
+ dp_iface_name: 'en2f0'
dp_iface_ip: '10.8.2.1'
dp_iface_gateway: '10.8.2.254'
dst:
- ip: '10.192.4.62'
+ ip: '10.192.20.198'
user: 'cord'
pass: 'cord'
- dp_iface_name: 'ens3'
+ dp_iface_name: 'ens3d1'
dp_iface_ip_qinq: '10.8.2.100'
dp_iface_ip: '10.8.3.1'
dp_iface_gateway: '10.8.3.254'
diff --git a/kubernetes-configs/flex-ocp-cord.conf b/kubernetes-configs/flex-ocp-cord.conf
deleted file mode 100644
index 13cacc4..0000000
--- a/kubernetes-configs/flex-ocp-cord.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: v1
-clusters:
-- cluster:
- certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRFNU1ESXdOekl5TVRZek1Wb1hEVEk1TURJd05ESXlNVFl6TVZvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTG1oCloraS8wK3VwbHc3cUYwMzNqaTluQzAwNk54UUNqbHRxaGN5dUJCVFhEZldJMTB6ZmVONHl0bkhlZUxHZFFyQXkKcnBiZzNBejYyWU5kenpVb21GcGZoY2YxdVdBd3o2ZG82dkQvcFcyZ1ZUL3RGMWdFSHRuZ1VaYnlGK2tlcmM3bgpUZjFnOUFGdm1kZTZmclN2Qkh3UVRGWGY2My9ZcCt6Zkg5QzJIMWE4Z0N6Vmhqb25PRFFzVjJvdjBrZ3FZNHN0CmFNc280V0s4M3hIdGx0bjdDdzNrQWtCQnY5a3N5cm8yTlk0RVhCS0VKcXZJV3c4Ymw0Mm9JMjYyMDJZNzBCeFgKRnE2M2NWMjY3eWNFdnptdFRGYUduUEdNcFoxNkcxMTJ3SHVxSmdmbWxmK3VvL05JT3FKVmZua0ZaMkZtZGhmRwp4WWZrUUw0UnhIcndabno1NlhzQ0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFLblBTSDE0YWFpUWttUjlycG81eUZaNS9jMmQKUWM1WDJHUk9URTU3YWNnQ0o1QzBhYS9hS1NZRmMra0xoRUVHd0dxZzE4VnE0L2MzMmIyVFEwL1ZYRE4rYXlXbwpYWUZzaERjdHRaSGttWmtpdHR3ZTBXN3BKRHZhMHI5dWZwSStRamh2dk16TlVrREUvbEFuckJTNUlEZ0N3bnVOCjZZcmpManFUVXR1SHprZ3pxNHJsUHNwcHdnRllDajdLU0VkR3h5NFhqSEk4eE5wR1hMZmhmajJuTy9BL2JjdHEKeDdZWTBZcFQrR0h1WDk5Tmx6YUVFYXloa1R6TUdaM2NGT0NKMVFjbURXYzZvRnl1VGxoT2xzaGZTVEt3WWZUWApKQUdxaDFKWHhkemMydmhMdkVzQ0lXVjh0MjhMKzBjc1BMYVR4V2k0QUdFR1VIL2VqWlgzaUllcFJTOD0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
- server: https://10.192.20.45:6443
- name: cluster.local
-contexts:
-- context:
- cluster: cluster.local
- user: kubernetes-admin
- name: kubernetes-admin@cluster.local
-current-context: kubernetes-admin@cluster.local
-kind: Config
-preferences: {}
-users:
-- name: kubernetes-admin
- user:
- client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJT3lyeG1kek5TMHd3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB4T1RBeU1EY3lNakUyTXpGYUZ3MHlNREF5TURjeU1qRTJNelJhTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQTFINEpiMHN3anljQVV5Q04KbG9yVHVXSWZXblVNd1UxRVc5V3Y5dk9hSDl0ZEIyVHM4enFyRWlLbE81SFhNR3QzeVFZNFJtbStaZ1pOQkFDSgpzRFlYbm5lSWlrejJvcVFiNE1mUEZrQVRhT1hYY0x4VlVtRjcvc2cwNm55dDRTVk5OcStybWcvYk84cWtIUk9UClpFODJCNG9iSDR6SjhhMDZTZVBXYk4zRGNRNVlYOWdWOWNCczZaeGx1d2d2dTZZblVDeTRnVmgwczU4ZTErREMKUEhTS25kLytHMlh3aWtRbG8vSWhEY3VKL0p6WnkrRTlIZkNIV2UwcUFBTVV2VmUzV3EraFdBYk0vcEx4M1VaWQoyN2pKMnlDWVZnQVdxd3Nwc0pDa0VGelRhR2hsOWp0NEZWTFJJN0xDUUtKUmtjdW9WTUN3S1BaY3lDTkRYRWN4ClI3L21md0lEQVFBQm95Y3dKVEFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFGMEtJSTVJTGJTTjFBQUlrSUYwbGJhN3Bnd2NoajVUQkZsOQoycWVHajVWMnJWRjVTZ1JGMFpmYkQ4VjJSUUdGWU1DLy9aYmpsRGQ2ZkV3dDNTYnlYdkY0c1ZMMThMdEJQR2phCkIycC9WR2E2eDYySElSQyt3bWNuazVGWVlIWkhxVm5KMTFHYVlOWFhEZTMzWlJ1eDNFMi90cmE5emlYU2xWVWwKZTJCZDRRVVBwd1dTL3pkMVFEZ3NxUzJHQ01NaTZBYStGM2x5LzVxVzVvY011Ni9ZaExhUmgvUUJOZ01CTmlhagpLNWV6ajBLOHpTRTZOYWdxK2ZldHkyRExmYnFHakw4aERvMlM2NHB6UGFHOExkdUFKcTdSZmhLVHVydmRMY1A4CmxqL2ovWWlpYnBFN3l5cEI0azNoWkFvemNEQ2ZJaGpHUUNHMXZDTlc1WFlNTFhNb1NRaz0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
- client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBMUg0SmIwc3dqeWNBVXlDTmxvclR1V0lmV25VTXdVMUVXOVd2OXZPYUg5dGRCMlRzCjh6cXJFaUtsTzVIWE1HdDN5UVk0Um1tK1pnWk5CQUNKc0RZWG5uZUlpa3oyb3FRYjRNZlBGa0FUYU9YWGNMeFYKVW1GNy9zZzA2bnl0NFNWTk5xK3JtZy9iTzhxa0hST1RaRTgyQjRvYkg0eko4YTA2U2VQV2JOM0RjUTVZWDlnVgo5Y0JzNlp4bHV3Z3Z1NlluVUN5NGdWaDBzNThlMStEQ1BIU0tuZC8rRzJYd2lrUWxvL0loRGN1Si9Kelp5K0U5CkhmQ0hXZTBxQUFNVXZWZTNXcStoV0FiTS9wTHgzVVpZMjdqSjJ5Q1lWZ0FXcXdzcHNKQ2tFRnpUYUdobDlqdDQKRlZMUkk3TENRS0pSa2N1b1ZNQ3dLUFpjeUNORFhFY3hSNy9tZndJREFRQUJBb0lCQURHRjlsano0eXRaNFo5KwpGTUdqTlZrZFgwVkx4bDgrek5IQ2FiSmFiKzlBeHR1MFQrMFlIVXFxdkd1M3Y3bFBNcW10UTJ4VnRNUStiN0NoCkYzWDBCV2t2WHFrczZzWlpEUTVFUXlWaVphT3EvWjBPcDZ2OWdGS1BBcFlyM0xKK2FSSjN1cnk3T1ZNa0ZUK1oKa2w1c2Y2RWVOTmdUamZVL2REaElXMjhmK0M3ZXhrenQxZjgyNXRsSGR0dFA4UFAzWFI5RFVoYW9HK1FPNnU3bgpwSW9URjFTdlU5R01QRWR4UEN2cDBEdkVxRmo5SE1kQ011ZmdhdWZhVjlaZkpTWTg5S3NwVWJWbkFoclgwM0M3CjFNdno4dmxpTzV1YmtObTlEclRyV0xtWGMwYUVaODdZOElDNk9SbjhrMzh5MzVIQzQrZjNSYWU2aU1MTEFqOHkKNTVwWUV0RUNnWUVBNjlXMS9BL3RoNGhqY0hUWjRBVkQyYmplQ1kxdTZ3ZHFKUklGWlB3U3pRK3JBYXdpSTV1RQo1aU1GdkVqNHpsVkZqSVR4WHZyeC9USHh5YzIxUGo5VUhJVHBjUFEwS01BN1MwdDNVeXRxM2tYM2lsZm8wMWRjCjFpNlhKanoyNG1mQkdwekJNOGJaTGdRV1RmV3NSRWcwdjdEUEFWWnpyd1ZPUy91bi9qa2FyVE1DZ1lFQTVxbGYKWExBQjdNanVaN091UWJQRG1Lcm81QlYvTzhSY3JuUkIwRlY1QTVXcnowUmorOHptSTQrMDJNckdaVFY2cTZIdQpIek1oRmpQVDAzOHZUdWo2Vm52V1pndUVOZTJva000WGVCRG1RZm85VVhrWDVHZ3lobytFSS9DeFVNNWdsOUxQCnA5NmFkUWRRVmpIWkFvUStXZytwTHV4QVhiRE5MQWtVUm1DK2FZVUNnWUFQbmhOekljcmxFczhpLzFuK1Q5cnkKYkIrb0drbWlIdGVVcE9EZWt5TGJtWklGaGxTc2J2d2FFVytyekZsTnNLL3VZazlwcnN5ZnE5TUxQaWdtZXlNaQowRnAxTkhiUHpBc2hMVm8xazhaNytiNHUxeXQvODJVZWVlOWdoT0VFbFVKZ2RNa0dtTUNCSDV3cWhYNW05ekVuCkVKcGt5RWpZNmswSkV4MUk1SmN6cVFLQmdCaUt1dC9FeGwrb1BWMkJTN0FuN1U3SUdJRjBIQmFDM1EyZXh3WGcKb2tDVVl6UnBaVzM4TGh4b2hPaHdJczNQODk1aEcxSHNnYis0QWZqRjFvWEIyaWpyZ2pOWFZGamNrWXZlc2JhUApyY0FsWFBMWFBJaUw0WnhabHNpd0tsMmJwOEZmcDhLSHQ4MXQyc2xoQW1MM0tSOHgvV0ZGdDgrQUtVUmZMdTRTCkN4QjFBb0dCQU1WcjhpNmJwcFVxQ095RC84Rk84VVZGajlpcmlIcHA4ZWt5UHR4dEpnZVBUc2lST0ZJVWtydmcKOWpYN0hRZnlVeHNzV2FIaEthUFdjdGpGNUU5elpxczNLRExPbngrTVNwK0NsSjVjampWMlJqZWhiRnNmYm16VApPblpMNXZDY25tekVNZ00vdWtrbzZ6M0xUYUY1L0dCQWE3dHJuRjhIZWZYeFUxa3ZVTzJrCi0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==