git review

New ocl packages, new key for packages, updated server info for lab

Change-Id: Iee2316f5e624278731c6625eec572c099f6c1a70
Signed-off-by: Stuart Mackie <wsmackie@juniper.net>
(cherry picked from commit 08d9db4bb34558cfda9c2c8655253d5cced66fb0)

2 files changed, 54 insertions, 53 deletions

diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh
index d10f3be6..5a72445e 100755
--- a/ci/02-deploybundle.sh
+++ b/ci/02-deploybundle.sh
@@ -170,7 +170,7 @@ openfile_fix() {
 
 if [ "$opnfvsdn" = "ocl" ]
 then
-  TAG="ubuntu16.04-4.0.0.0-20.tar.gz"
+  TAG="ubuntu16.04-4.0.1.0-32.tar.gz"
 
   for ROLE in contrail-controller contrail-analytics contrail-analyticsdb
   do
diff --git a/ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml b/ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml
index 171f1951..3746a1e5 100644
--- a/ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml
@@ -7,32 +7,33 @@
             -----BEGIN PGP PUBLIC KEY BLOCK-----
             Version: GnuPG v1
 
-            mQENBFkIj2sBCADL2Kws0P+19LnEMuWmGDJFo5WjJ3nk6ubf8AKQiF/5MMyYP665
-            s3nKviU4gO+NBjMGIRWfVDUdikG/mUhlIC2x17lrIVA1rrOj7IwL6CgLDOn5lQeu
-            SOL2XavLToJlG1TgkPOObmCjeg8wZxswUIIc9BVVdG2XKFlEEQ0ExyhDjq25JuOI
-            OaWsY0TrAfuLnimZ/cchBT8ThTcheko47jaKnHI0rlsqXKX6oeZ1vIAtMSPIAuc/
-            G0Et8z+aXY7vpWRrJsdXvZECJCVhc58af3LwmcczC5WvwGbrTI2Q7mCiVoUUyRV/
-            MBXYSPZFCiLZHBive5ZrpfWozoLDUL+dZCMrABEBAAG0LFN0dWFydCBNYWNraWUg
-            KE9QTkZWKSA8d3NtYWNraWVAanVuaXBlci5uZXQ+iQE4BBMBAgAiBQJZCI9rAhsD
-            BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRB8SBQaOveMpwTSB/0Y0Fr0xXA+
-            fd2j6Xq8+LJF6aM1/GKz9u36QR4nD2J6J4I01/OeJnemco1yPgkm7zLMMmWfIyRV
-            1WStkRiKxcWYXU4Fg+iCikbPG09z5FeIDWh643mYClLpg+jI+c8gsYSzqiuLw7NM
-            4Qn/cKqSh1IunFWgRSKpPlGgFSn+3jWaRZs98Pq+Zqz+FbjWArrsyWMsFXuB7/vm
-            X2wz1IcHWO4kcjtMaeTizMIitAjmWl0cO9X4IBgQMwRxlelD4lAw+iyCLUTkqmOW
-            kncGgfOOyV0A5Cd2Ws2Hi7Ikz1RUI6OqyVtlC76cEIG+DnPmb0v1BH8CQ6bLOrOT
-            kETcdvBBZOMmuQENBFkIj2sBCACy4VoDFcy8ZyLuKOwQw/9LdGMFkbb3OJDsrPT0
-            bz9CmYHSTRVAbJljlOa0Q/qzpPNk7jHslMBjewp5nSdK091/LBc9OJw9SDcnLWHM
-            Nxxes6IyVOqZe2Xa49S3FqMJsfYf3Q6i89L5WySr+bcfF0+CFe57cKFGX3l/pPE2
-            dVwIsCUo1puEFrvSJqQiU22MtrL7g8XM83zJF5OU7u34+BR+Rc40MSJm7dsbn29m
-            QKlmkoV1KSG7va/WNoz1sfySmPgMjHx2b1f5GGt3du5RQESn1jDTHdNj+bqvrQ3r
-            uw6SbbuCsGzMJMD3LovfI62xNGYhda/GlHgYAyg0nDJ1aa3TABEBAAGJAR8EGAEC
-            AAkFAlkIj2sCGwwACgkQfEgUGjr3jKdeigf/QsBlCNOXcuXjU0gw6w6Q77XQcNzD
-            4+Bw2igCmQOhAZSMLsRMMWzLiu35xthVcUOACyLfCSZWSLQh8x8jGpU29cMhLqlY
-            CMerpnFldqH+f3omORBENAFCO1C4ZGym+zLFSBQBZhf8U7y2eC/sSeCGMEOkKpbg
-            TX5psQXa8SnjWUrfg0aDgd4KVK+AGE3BTVaJmT//OrXy8e4AzspX8oNa15ntk/ll
-            WOsSJ4g1WHIk3mwPLjCwufbu4GErHBxyCfYlG1I3Vu8Ilp7dL3vpjcDRocJLoIyb
-            WUHA5RozR0o3GEI/IDS5TiVqMxqvdkayP1ySrjBbQxT3wOiTBxic5wI/zQ==
-            =5y7K
+
+            mQENBFgjd4cBCAC7nEIGx6SRod7OONALolVPDV/lGIRUH/qU1HYULTxALnve0vn2
+            gOYDROZWWLN5yAWwOnNJ/xrXJdvlJ+wT3vSord3dafe42ynajJB48NNfgq0qCzJy
+            832jA5CUPqoSBEQtWnEl6oDTf9iL/bsvybLKys1llQqZkgLNOunwJe9Mp0nhv9G3
+            7C7MpmjGjd3eviZaTPevONFVtDbWHU5QG8VEdX3n9QBNLzgaddMrY3ejg9ajGJ5H
+            OOiSa71OxVZG+hc6O26LtjZgXikZ5CZLbCSHMpzXOZzuKn1xbLz1BLna5F5Y7czs
+            XywyHK/Fq07T7ihzZ3GEhVfpbpOF+7egSY4lABEBAAG0J2plbmtpbnMgKGplbmtp
+            bnMpIDxqZW5raW5zQGp1bmlwZXIubmV0PokBOAQTAQIAIgUCWCN3hwIbAwYLCQgH
+            AwIGFQgCCQoLBBYCAwECHgECF4AACgkQeXOdQRGBcvcSaggAoh/87zZvJ09dH9yn
+            gGMtlnRyfob9LIpW9A9QB7yIpwm+awye0rG7cH6vs3LH9sr4V+GDhXNl3eaO9+BT
+            9XxoyPllZ4tjiZ7kCKslK95V5mmHKa8hnnA7bo7sKrXJ3w5nYowEQUYLdaMdrWLx
+            cyJFJuYKEP5Fkx6TECsebMR4ly6rJjGDLFysuhWNAjOm7lNG2ZtS9s5d101HNhxN
+            RH71YMOGEfc2XeW5B6o2enjRmBWeoEIVhxn8YyPqtHbwQNwoSCdIXNyWF0f6Ju+s
+            q7OAPzGkWMdvXwN3Wlko8qitB+yGXE9muip7osEbt3gpwhMCcYiprvIBKdDoQPBc
+            1xYMDrkBDQRYI3eHAQgAniMKcSf1aEergyyZZKFyQ4hkgAsg5eM3H5UngKDqAJZF
+            fuaibQ3jzpdqtGQU2xLPHNKsJIqAsGtxEnfXmZAdwJHkx+xMOV0VorMEU5HuuEFc
+            WXL1WL6dRfEmmFev0/ZBtZm4EE/ARlnTLBqxLRooEGljIacdqVakr8J23kbChulA
+            oz7AaWzJYzCcbvwveNL9ZxEQDLMtIcAXh5LubBZDR0uq9UgkPX3wTdQ0zQ6hR3MZ
+            KK0WYvXIPgESmrstCOrSR9X1d8hwjjwsgwVQwp1vGGHjWjEleCZvz7WyM0qFIRcj
+            9kLbnm6flJMK0Bowg/3yuiG55EBK+3b9TNdSDuG/mwARAQABiQEfBBgBAgAJBQJY
+            I3eHAhsMAAoJEHlznUERgXL3aYAH/3GKj4V0qJCi7lW2NMH0nCdqp5Q1pyIm77Nv
+            VU4WH16jNXcNPKJv+9yLC2tCkfVcX7C2clT25SJ4dwPsos2Kcnnh3nNHi6S9SxWG
+            GzVy7o0preT1M01LE5zAADQlBPelOZseEM4EWgszNQ0dxrn030YWH9jKoNjUGI0W
+            hRq4c2qV1N7RG/QiIWJhB4Fkyxh5bl0GODjYhPB/3am2i8gkTksH9FQa1cVydVSc
+            FV6Ju8WGiUPpHGnDEmyzqudIAXtNApN16AO+09ECOaIJEgO+wcUZpJ8tAkrQ1CZs
+            FMy4DESyZ1go1Myueds3X6iCCCtrmk9x5FAKRMb7NvkN2+dbj5s=
+            =9u/w
             -----END PGP PUBLIC KEY BLOCK-----
 
         install-sources: |
@@ -46,32 +47,32 @@
             -----BEGIN PGP PUBLIC KEY BLOCK-----
             Version: GnuPG v1
 
-            mQENBFkIj2sBCADL2Kws0P+19LnEMuWmGDJFo5WjJ3nk6ubf8AKQiF/5MMyYP665
-            s3nKviU4gO+NBjMGIRWfVDUdikG/mUhlIC2x17lrIVA1rrOj7IwL6CgLDOn5lQeu
-            SOL2XavLToJlG1TgkPOObmCjeg8wZxswUIIc9BVVdG2XKFlEEQ0ExyhDjq25JuOI
-            OaWsY0TrAfuLnimZ/cchBT8ThTcheko47jaKnHI0rlsqXKX6oeZ1vIAtMSPIAuc/
-            G0Et8z+aXY7vpWRrJsdXvZECJCVhc58af3LwmcczC5WvwGbrTI2Q7mCiVoUUyRV/
-            MBXYSPZFCiLZHBive5ZrpfWozoLDUL+dZCMrABEBAAG0LFN0dWFydCBNYWNraWUg
-            KE9QTkZWKSA8d3NtYWNraWVAanVuaXBlci5uZXQ+iQE4BBMBAgAiBQJZCI9rAhsD
-            BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRB8SBQaOveMpwTSB/0Y0Fr0xXA+
-            fd2j6Xq8+LJF6aM1/GKz9u36QR4nD2J6J4I01/OeJnemco1yPgkm7zLMMmWfIyRV
-            1WStkRiKxcWYXU4Fg+iCikbPG09z5FeIDWh643mYClLpg+jI+c8gsYSzqiuLw7NM
-            4Qn/cKqSh1IunFWgRSKpPlGgFSn+3jWaRZs98Pq+Zqz+FbjWArrsyWMsFXuB7/vm
-            X2wz1IcHWO4kcjtMaeTizMIitAjmWl0cO9X4IBgQMwRxlelD4lAw+iyCLUTkqmOW
-            kncGgfOOyV0A5Cd2Ws2Hi7Ikz1RUI6OqyVtlC76cEIG+DnPmb0v1BH8CQ6bLOrOT
-            kETcdvBBZOMmuQENBFkIj2sBCACy4VoDFcy8ZyLuKOwQw/9LdGMFkbb3OJDsrPT0
-            bz9CmYHSTRVAbJljlOa0Q/qzpPNk7jHslMBjewp5nSdK091/LBc9OJw9SDcnLWHM
-            Nxxes6IyVOqZe2Xa49S3FqMJsfYf3Q6i89L5WySr+bcfF0+CFe57cKFGX3l/pPE2
-            dVwIsCUo1puEFrvSJqQiU22MtrL7g8XM83zJF5OU7u34+BR+Rc40MSJm7dsbn29m
-            QKlmkoV1KSG7va/WNoz1sfySmPgMjHx2b1f5GGt3du5RQESn1jDTHdNj+bqvrQ3r
-            uw6SbbuCsGzMJMD3LovfI62xNGYhda/GlHgYAyg0nDJ1aa3TABEBAAGJAR8EGAEC
-            AAkFAlkIj2sCGwwACgkQfEgUGjr3jKdeigf/QsBlCNOXcuXjU0gw6w6Q77XQcNzD
-            4+Bw2igCmQOhAZSMLsRMMWzLiu35xthVcUOACyLfCSZWSLQh8x8jGpU29cMhLqlY
-            CMerpnFldqH+f3omORBENAFCO1C4ZGym+zLFSBQBZhf8U7y2eC/sSeCGMEOkKpbg
-            TX5psQXa8SnjWUrfg0aDgd4KVK+AGE3BTVaJmT//OrXy8e4AzspX8oNa15ntk/ll
-            WOsSJ4g1WHIk3mwPLjCwufbu4GErHBxyCfYlG1I3Vu8Ilp7dL3vpjcDRocJLoIyb
-            WUHA5RozR0o3GEI/IDS5TiVqMxqvdkayP1ySrjBbQxT3wOiTBxic5wI/zQ==
-            =5y7K
+            mQENBFgjd4cBCAC7nEIGx6SRod7OONALolVPDV/lGIRUH/qU1HYULTxALnve0vn2
+            gOYDROZWWLN5yAWwOnNJ/xrXJdvlJ+wT3vSord3dafe42ynajJB48NNfgq0qCzJy
+            832jA5CUPqoSBEQtWnEl6oDTf9iL/bsvybLKys1llQqZkgLNOunwJe9Mp0nhv9G3
+            7C7MpmjGjd3eviZaTPevONFVtDbWHU5QG8VEdX3n9QBNLzgaddMrY3ejg9ajGJ5H
+            OOiSa71OxVZG+hc6O26LtjZgXikZ5CZLbCSHMpzXOZzuKn1xbLz1BLna5F5Y7czs
+            XywyHK/Fq07T7ihzZ3GEhVfpbpOF+7egSY4lABEBAAG0J2plbmtpbnMgKGplbmtp
+            bnMpIDxqZW5raW5zQGp1bmlwZXIubmV0PokBOAQTAQIAIgUCWCN3hwIbAwYLCQgH
+            AwIGFQgCCQoLBBYCAwECHgECF4AACgkQeXOdQRGBcvcSaggAoh/87zZvJ09dH9yn
+            gGMtlnRyfob9LIpW9A9QB7yIpwm+awye0rG7cH6vs3LH9sr4V+GDhXNl3eaO9+BT
+            9XxoyPllZ4tjiZ7kCKslK95V5mmHKa8hnnA7bo7sKrXJ3w5nYowEQUYLdaMdrWLx
+            cyJFJuYKEP5Fkx6TECsebMR4ly6rJjGDLFysuhWNAjOm7lNG2ZtS9s5d101HNhxN
+            RH71YMOGEfc2XeW5B6o2enjRmBWeoEIVhxn8YyPqtHbwQNwoSCdIXNyWF0f6Ju+s
+            q7OAPzGkWMdvXwN3Wlko8qitB+yGXE9muip7osEbt3gpwhMCcYiprvIBKdDoQPBc
+            1xYMDrkBDQRYI3eHAQgAniMKcSf1aEergyyZZKFyQ4hkgAsg5eM3H5UngKDqAJZF
+            fuaibQ3jzpdqtGQU2xLPHNKsJIqAsGtxEnfXmZAdwJHkx+xMOV0VorMEU5HuuEFc
+            WXL1WL6dRfEmmFev0/ZBtZm4EE/ARlnTLBqxLRooEGljIacdqVakr8J23kbChulA
+            oz7AaWzJYzCcbvwveNL9ZxEQDLMtIcAXh5LubBZDR0uq9UgkPX3wTdQ0zQ6hR3MZ
+            KK0WYvXIPgESmrstCOrSR9X1d8hwjjwsgwVQwp1vGGHjWjEleCZvz7WyM0qFIRcj
+            9kLbnm6flJMK0Bowg/3yuiG55EBK+3b9TNdSDuG/mwARAQABiQEfBBgBAgAJBQJY
+            I3eHAhsMAAoJEHlznUERgXL3aYAH/3GKj4V0qJCi7lW2NMH0nCdqp5Q1pyIm77Nv
+            VU4WH16jNXcNPKJv+9yLC2tCkfVcX7C2clT25SJ4dwPsos2Kcnnh3nNHi6S9SxWG
+            GzVy7o0preT1M01LE5zAADQlBPelOZseEM4EWgszNQ0dxrn030YWH9jKoNjUGI0W
+            hRq4c2qV1N7RG/QiIWJhB4Fkyxh5bl0GODjYhPB/3am2i8gkTksH9FQa1cVydVSc
+            FV6Ju8WGiUPpHGnDEmyzqudIAXtNApN16AO+09ECOaIJEgO+wcUZpJ8tAkrQ1CZs
+            FMy4DESyZ1go1Myueds3X6iCCCtrmk9x5FAKRMb7NvkN2+dbj5s=
+            =9u/w
             -----END PGP PUBLIC KEY BLOCK-----
 
         install-sources: |