14 files changed, 57 insertions, 7 deletions
diff --git a/labs/arm/pod5.yaml b/labs/arm/pod5.yaml
index 3708b7f0..3a55678e 100644
--- a/labs/arm/pod5.yaml
+++ b/labs/arm/pod5.yaml
@@ -8,6 +8,7 @@
 ---
 ### Enea ARM POD 5 descriptor file ###
 
+version: 1.0
 details:
   pod_owner: ENEA AB
   contact: dan.lilliehorn@enea.com
diff --git a/labs/arm/pod6.yaml b/labs/arm/pod6.yaml
index dc53888c..3b558164 100644
--- a/labs/arm/pod6.yaml
+++ b/labs/arm/pod6.yaml
@@ -8,6 +8,7 @@
 ---
 ### Enea ARM POD 6 descriptor file ###
 
+version: 1.0
 details:
   pod_owner: ENEA AB
   contact: dan.lilliehorn@enea.com
diff --git a/labs/bii/pod1.yaml b/labs/bii/pod1.yaml
index 44eedc37..40ac58d4 100644
--- a/labs/bii/pod1.yaml
+++ b/labs/bii/pod1.yaml
@@ -8,6 +8,7 @@
 ---
 ### This is a BII POD1 descriptor file ###
 
+version: 1.0
 details:
   pod_owner: ylong
   contact: ylong@biigroup.cn, zjtang@biigroup.cn
diff --git a/labs/ericsson/pod1.yaml b/labs/ericsson/pod1.yaml
index ae04b309..d8a51556 100644
--- a/labs/ericsson/pod1.yaml
+++ b/labs/ericsson/pod1.yaml
@@ -8,6 +8,7 @@
 ---
 ### POD descriptor file ###
 
+version: 1.0
 details:
   pod_owner: Jose Lausuch
   contact: jose.lausuch@ericsson.com
@@ -39,8 +40,26 @@ jumphost:
     versions:
       - 1.0
       - 2.0
-    user:
-    pass:
+    user: >
+      ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw
+      DQYJKoZIhvcNAQEBBQAEggEAuQkYMXyWaXfQQUhqa1uKr3idY/TDnYF+fMyb
+      uuI1EFGnqXyJyY5C6CxyR61sTBrni49LPh/EmuLWzv0SLclJYnIfSOQrCbO5
+      Sy4IFen6eMGd4x8OLLN0cQBSRnpxFRnmGnnqdLjcZYDYSfvP8U0vE46cRFM+
+      PWRBMJm9+2iz/+wPY8z1aqQ03YycSgKo7R7hEXlarqjJexr/mnP+WLXnz/yN
+      qi0/E9q93X8e0JnQnxRG69K/AOih4pjW4kW8T53JbFmSq5whTdF7SpGAsUqt
+      +5pr5Bs/9yMk9g00XqDmhiCNlNO8ADSDKW1YWQXWHQFMazwZI4GipQA9P/I6
+      CXRrKTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCtE4yYqripA3lKyuS4
+      O7T2gBBL83JWGyHgxbluxLakRfZx]
+    pass: >
+      ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw
+      DQYJKoZIhvcNAQEBBQAEggEAcNPG79QTsU1TDQZBWMENe+jI9rOfqabAiXJb
+      K+fbSVRY9gUTis2Bxaq/fWq4VGycPDfeZIKfGK5lgwaxd+yWbfHpHU2Itfav
+      L5s7zoH8yCk6vvfdTGEa+rM/CupqMRF0l/N/bFHMjf1TpUycw37KfaEcpV8T
+      /+ZJdpNCt+C5n67liLWr/fIGtcZB7HVFlIJOfniVoF9EfSwrNkKAJ5vYSAGe
+      KYhqgbQ1EFWf9/dJdAq0A4HuKixiMpc6qOX/moNTLTRPd6jN2veT7t4blqZM
+      cQU8Y3avbnAurd6Bu5i52d9kGebkUfYqUnkNCzyObi6WU5ZuJ8oxdzcQghb3
+      sIRM3jA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDA0e139hbToTK8gZ1/
+      UoEfgBDHho1xQ2fi5kh1g0FyFTpw]
   remote_management:
     <<: *remoteparas
     address: 172.16.1.21/24
diff --git a/labs/ericsson/pod2.yaml b/labs/ericsson/pod2.yaml
index 8814c42d..c0aef2c2 100644
--- a/labs/ericsson/pod2.yaml
+++ b/labs/ericsson/pod2.yaml
@@ -1,6 +1,7 @@
 ---
 ### POD descriptor file ###
 
+version: 1.0
 details:
   pod_owner: Jose Lausuch
   contact: jose.lausuch@ericsson.com
@@ -32,8 +33,26 @@ jumphost:
     versions:
       - 1.0
       - 2.0
-    user:
-    pass:
+    user: >
+      ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw
+      DQYJKoZIhvcNAQEBBQAEggEAZ+KIpufJFbXv6vcsevPYdhO2lBkYCnmoMKNa
+      lwDsynavzbIDeZmUlpf8xCOu/f7/VQfQdJCd6aZSScALlPSYgr39b0SPPfnr
+      Kx3jfOZnu8SEK+UJIalvebApmMdKM/vaKTWENV5PXyGcYwf8Q2lVxyXpxLVs
+      /FkDg1kB2VpdYaVfseY98LgLkP06uyfBPXH189BlQrxZcw3Af64BYgWfpDDt
+      w3RzIGCxAOMMZ8lEOnY4ofrsWaQA5YH12ezOT3Mwd/wkOuqcU19fOYaeS9Ou
+      050m6H9DJDnR5btjLIrjjKINp5Nf6hHG5mngUc5JVdRKNvD0ONBi6Bj0cvGF
+      STfaXTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDSD+x9ybRnBdCQaY7n
+      aDlygBA4t2kc8UOwZYE6ZZaFUgl1]
+    pass: >
+      ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw
+      DQYJKoZIhvcNAQEBBQAEggEAkHaGqpTmg+YSLPS5AwhB1N6MBA9cXTA1oacT
+      8bY1aLBi7HKbacJQjHOfr2FoIAABkgV7N+BXKfebMighfcDC9XtKGYnV3tCD
+      XpreNZgX8NmVaYOLP6sFkAk53oYljswKOVVUrAqXplZx4kBXYm0Az2beGg5J
+      5LRNwu9Eh4SRYN4dFN/XKQMtsQzKjMWTBLde9snrbhYfOxSsAR0B4FD7WWik
+      viKQY82C6C3KbcBeESMPE/lgBj7KIPbYkpzk9N5GafK+XkUS2aopAAkQFGll
+      60Y0/9LOwPzItCB1q/kEENgz1aw/nHeH3xQsErwepuZiW3SkMncPQ9L5Q5PR
+      hlricTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB8T/wzhjtvtwZ+Iz2Y
+      SKM7gBBWbUmwjBdGX6aurCiyVGv2]
   remote_management:
     <<: *remoteparas
     address: 172.16.2.11/24
diff --git a/labs/huawei/pod1.yaml b/labs/huawei/pod1.yaml
index f48d8239..807c6f3e 100644
--- a/labs/huawei/pod1.yaml
+++ b/labs/huawei/pod1.yaml
@@ -9,6 +9,7 @@
 ---
 ### POD descriptor file ###
 
+version: 1.0
 details:
   pod_owner: Tianwei Wu
   contact: wutianwei1@hauwei.com
diff --git a/labs/intel/pod18.yaml b/labs/intel/pod18.yaml
index b1123b7e..24c14fda 100644
--- a/labs/intel/pod18.yaml
+++ b/labs/intel/pod18.yaml
@@ -2,6 +2,7 @@
 
 ### POD descriptor file ###
 
+version: 1.0
 details:
   pod_owner: Jack Morgan
   contact: jack.morgan@intel.com
@@ -38,8 +39,8 @@ jumphost:
     versions:
       - 1.0
       - 2.0
-    user:
-    pass:
+    user: changeme
+    pass: changeme
   remote_management:
     <<: *remoteparas
     address: 10.10.180.10
@@ -122,7 +123,7 @@ nodes:
     remote_management:
       <<: *remoteparas
       address: 10.10.180.12/24
-      mac_address: "A4:BF:01:16:31:1G"
+      mac_address: "A4:BF:01:16:31:1F"
     interfaces:
       - name: 'nic1'
         speed: 1gb
diff --git a/labs/lf/pod2.yaml b/labs/lf/pod2.yaml
index ab60bdb8..219b2a68 100644
--- a/labs/lf/pod2.yaml
+++ b/labs/lf/pod2.yaml
@@ -8,6 +8,7 @@
 ---
 ### LF POD 2 descriptor file ###
 
+version: 1.0
 details:
   pod_owner: Trevor Bramwell
   contact: tbramwell@linuxfoundation.org
diff --git a/labs/lf/pod5.yaml b/labs/lf/pod5.yaml
index 60ab4029..61ca3ebe 100644
--- a/labs/lf/pod5.yaml
+++ b/labs/lf/pod5.yaml
@@ -8,6 +8,7 @@
 ---
 ### LF POD 5 descriptor file ###
 
+version: 1.0
 details:
   pod_owner: Trevor Bramwell
   contact: tbramwell@linuxfoundation.org
diff --git a/labs/nokia/pod1.yaml b/labs/nokia/pod1.yaml
index 037d4f97..6b684aeb 100644
--- a/labs/nokia/pod1.yaml
+++ b/labs/nokia/pod1.yaml
@@ -8,6 +8,7 @@
 ---
 ### Nokia POD descriptor file ###
 
+version: 1.0
 details:
   pod_owner: Mika Rautakumpu
   contact: opnfv-public-lab-admin@list.nokia.com
diff --git a/labs/zte/pod1.yaml b/labs/zte/pod1.yaml
index 1b4d1ad6..9a4a8a02 100644
--- a/labs/zte/pod1.yaml
+++ b/labs/zte/pod1.yaml
@@ -9,6 +9,7 @@
 ### ZTE POD 1 descriptor file ###
 # refering to https://gerrit.opnfv.org/gerrit/#/c/23727/9/config/pod1.yaml
 
+version: 1.0
 details:
   pod_owner: Alex Yang
   contact: yangyang1@zte.com.cn
diff --git a/labs/zte/pod2.yaml b/labs/zte/pod2.yaml
index f51d7f79..e5dd5e67 100644
--- a/labs/zte/pod2.yaml
+++ b/labs/zte/pod2.yaml
@@ -9,6 +9,7 @@
 ### ZTE POD 2 descriptor file ###
 # refering to https://gerrit.opnfv.org/gerrit/#/c/23727/9/config/pod1.yaml
 
+version: 1.0
 details:
   pod_owner: Alex Yang
   contact: yangyang1@zte.com.cn
diff --git a/labs/zte/pod3.yaml b/labs/zte/pod3.yaml
index 063b7dfc..b6768396 100644
--- a/labs/zte/pod3.yaml
+++ b/labs/zte/pod3.yaml
@@ -9,6 +9,7 @@
 ### ZTE POD 3 descriptor file ###
 # refering to https://gerrit.opnfv.org/gerrit/#/c/23727/9/config/pod1.yaml
 
+version: 1.0
 details:
   pod_owner: Alex Yang
   contact: yangyang1@zte.com.cn
diff --git a/labs/zte/pod9.yaml b/labs/zte/pod9.yaml
index 76d4aa9e..c18d244e 100644
--- a/labs/zte/pod9.yaml
+++ b/labs/zte/pod9.yaml
@@ -8,6 +8,7 @@
 ---
 ### ZTE POD 9 descriptor file ###
 
+version: 1.0
 details:
   pod_owner: Zhiijang Hu
   contact: huzhijiang@zte.com.cn