summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStuart Mackie <wsmackie@juniper.net>2018-04-11 14:54:06 -0400
committerStuart Mackie <wsmackie@juniper.net>2018-04-11 18:58:50 +0000
commit266a4fd08bef19fca930cbbb1d45f5639b87d3c0 (patch)
tree6cf198a7b967afe636dbfe36d539f6e926525392
parentf1b6b2867e4e907cb84ea4670ad32f36bddcbf6c (diff)
Fixes for OpenContrail running on Pike in Fraser release:opnfv-6.0.0
- 02-deploybundle.sh - updated package names - 03-maasdeploy.sh - Iterate pods create command to get past "Conflict error" - config_tpl/juju2/bundle_tpl/oclphase1.yaml - updated public keys - deploy.sh - changed usage message to reflect using ocl not opencontrail Change-Id: If2d3820a4984498813d86162a1208402aceca312 Signed-off-by: Stuart Mackie <wsmackie@juniper.net>
-rwxr-xr-xci/02-deploybundle.sh2
-rwxr-xr-xci/03-maasdeploy.sh15
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml109
-rwxr-xr-xci/deploy.sh2
4 files changed, 70 insertions, 58 deletions
diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh
index df669a8..9473f32 100755
--- a/ci/02-deploybundle.sh
+++ b/ci/02-deploybundle.sh
@@ -156,7 +156,7 @@ openfile_fix() {
if [ "$opnfvsdn" = "ocl" ]
then
- TAG="ubuntu16.04-4.0.2.0-34.tar.gz"
+ TAG="ubuntu16.04-4.1.1.0-103.tar.gz"
for ROLE in contrail-controller contrail-analytics contrail-analyticsdb
do
diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh
index 869d97e..d10e9a3 100755
--- a/ci/03-maasdeploy.sh
+++ b/ci/03-maasdeploy.sh
@@ -579,7 +579,20 @@ addnodes(){
done
fi
- maas $PROFILE pods create type=virsh power_address="$VIRSHURL" power_user=$USER
+ # Iterate to avoid "Conflict error" issue
+ for ii in 1 2 3 4 5 6 7 8 9 10
+ do
+ echo "Try $ii"
+ maas $PROFILE pods create type=virsh power_address="$VIRSHURL" power_user=$USER > /tmp/deploy.out 2>&1 || true
+ cat /tmp/deploy.out
+ if ! fgrep -q 'Conflict' /tmp/deploy.out
+ then
+ break
+ else
+ continue
+ fi
+ done
+
# Make sure nodes are added into MAAS and none of them is in commissioning state
i=0
diff --git a/ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml b/ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml
index 3746a1e..06a91f9 100644
--- a/ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml
@@ -7,37 +7,36 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1
-
- 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
+ mQENBFqVcvkBCACnPEXVBLmB79vQFRMu8sg4cNl0nvxTfStlkbrsuqs4JCKhvVWU
+ 6xF7Fa3e8up6t8Wn+53yqBEQhImN3RTDfE1RijHbIDHED2K8XtmMzHzN/ZuOwTxN
+ PdXN70HF+HBMW4egbDcImSyullPw65D5C3pHKZHmbnwPjXOAEdy3+6/8iNZex3mf
+ 4PDNs+KFmEblRWMTWryK7BdU3KI41o6jlixm5BkgPOQ5Tn0IZ300pGsIm2rvb6nN
+ LHsBDSPkamjGleDidqqEnS7ueMiRNSYg33bxbA/V5EtMcHpGbLSyMaLodqv5H/0L
+ ibt1nKEJnuV1/nNrTQMSpWCIGn5+f3UzQX+XABEBAAG0LFN0dWFydCBNYWNraWUg
+ KE9QTkZWKSA8d3NtYWNraWVAanVuaXBlci5uZXQ+iQE4BBMBAgAiBQJalXL5AhsD
+ BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRDVIWmOj2VUIlUFB/9T8faY5vnZ
+ zJvU3GUJI4nNjj7kZeotfItBrBTtcWblkalIvDg/qqyMW6ZWr8Bl5I/Cs8LIDi5/
+ UaHkrekpU5tECWZkF+qbUcoZ7e0wENj1L3j+SHHJZ231pU2N6Dkrks+X1QL7qcx1
+ xXUMajzd+BfyxMGshpNu1vRmwVbtJNrRYzpPclfNsdz0D264o04n9XgSZMCz52gM
+ bNF1l9QEm7mVDZMxPImSNr2JjQCtKOuiTyQpXtzXQEVPwLerrG+3Ys6leSggckXp
+ W9sTEGDt8fREsUgWthAST4k2NRtA/yaULnbQZYChTmIzOPcw9gT5gl4KIzOpZc5t
+ fTIc/RNsBB2BuQENBFqVcvkBCACzqDT7QAw7xIN7gKQWzX82DZLCnTuOx83jW3U+
+ cEZVFhYNfsqUY+Kp48IyePqeQCYvoBxkVGhnIBCT4cRzlfwj2AxoI8S4mDMI6GlD
+ Q0DaAlX+BFKDqLPOrDrFGtYBDwMWVjhgV4PaZ5w4J17RKaann5RWBTFObNtUNVtJ
+ Xr7XRUjBnUg76nZX6qzUj22V7LBMtF8vcf+pe+AHY0OV24CGJOvHbUNS+sh8Sfse
+ yGpqSdoVjU9UjgkSpiJl7PWFPrXqoiNsxR6nEeXufy8q9+X4DsCVdiaomifCw1FN
+ HoP/xVUDUDBMeTAC8zseTardit4rt0Gtuk+5DuRm9otpGNSbABEBAAGJAR8EGAEC
+ AAkFAlqVcvkCGwwACgkQ1SFpjo9lVCKUOggAh8CNa+AkoEJsRCtzjW+3dJIaSk5w
+ KEpq9fVlmAcCbyIimB3NDAgGLSCTSc3JeXt5Hdgp4M0+j56lVEOtcTC0HWQYYVL2
+ 4QKv9fLypgJe5DLYtQmAyQOXNmO6P77/2KdeB1flxZiWmCDr3VJRgWseMILKb3oQ
+ 49Hfmk7HQrKOi0KaHbx0tpbUHo3uWR4H/QeQE3pCOA+ighqP3Mu3AHI/ySmWZyhc
+ kvvGambz75gXUdOb9L6eqV9lHQhFUCJznMdjCpd8HUFsbQiAaWKsFv5T5cpmBhDc
+ /MslWGpfFi+hs/ritGELl9+CiFdn6YPXULEb653V65ev8vg7NwX78ifNQw==
+ =SMUT
-----END PGP PUBLIC KEY BLOCK-----
install-sources: |
- - "deb http://65.122.57.42/repo /"
+ - "deb http://65.122.57.45:30002/opnfv /"
contrail-agent:
charm: ./{{ ubuntu.release }}/contrail-agent
@@ -47,36 +46,36 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1
- 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
+ mQENBFqVcvkBCACnPEXVBLmB79vQFRMu8sg4cNl0nvxTfStlkbrsuqs4JCKhvVWU
+ 6xF7Fa3e8up6t8Wn+53yqBEQhImN3RTDfE1RijHbIDHED2K8XtmMzHzN/ZuOwTxN
+ PdXN70HF+HBMW4egbDcImSyullPw65D5C3pHKZHmbnwPjXOAEdy3+6/8iNZex3mf
+ 4PDNs+KFmEblRWMTWryK7BdU3KI41o6jlixm5BkgPOQ5Tn0IZ300pGsIm2rvb6nN
+ LHsBDSPkamjGleDidqqEnS7ueMiRNSYg33bxbA/V5EtMcHpGbLSyMaLodqv5H/0L
+ ibt1nKEJnuV1/nNrTQMSpWCIGn5+f3UzQX+XABEBAAG0LFN0dWFydCBNYWNraWUg
+ KE9QTkZWKSA8d3NtYWNraWVAanVuaXBlci5uZXQ+iQE4BBMBAgAiBQJalXL5AhsD
+ BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRDVIWmOj2VUIlUFB/9T8faY5vnZ
+ zJvU3GUJI4nNjj7kZeotfItBrBTtcWblkalIvDg/qqyMW6ZWr8Bl5I/Cs8LIDi5/
+ UaHkrekpU5tECWZkF+qbUcoZ7e0wENj1L3j+SHHJZ231pU2N6Dkrks+X1QL7qcx1
+ xXUMajzd+BfyxMGshpNu1vRmwVbtJNrRYzpPclfNsdz0D264o04n9XgSZMCz52gM
+ bNF1l9QEm7mVDZMxPImSNr2JjQCtKOuiTyQpXtzXQEVPwLerrG+3Ys6leSggckXp
+ W9sTEGDt8fREsUgWthAST4k2NRtA/yaULnbQZYChTmIzOPcw9gT5gl4KIzOpZc5t
+ fTIc/RNsBB2BuQENBFqVcvkBCACzqDT7QAw7xIN7gKQWzX82DZLCnTuOx83jW3U+
+ cEZVFhYNfsqUY+Kp48IyePqeQCYvoBxkVGhnIBCT4cRzlfwj2AxoI8S4mDMI6GlD
+ Q0DaAlX+BFKDqLPOrDrFGtYBDwMWVjhgV4PaZ5w4J17RKaann5RWBTFObNtUNVtJ
+ Xr7XRUjBnUg76nZX6qzUj22V7LBMtF8vcf+pe+AHY0OV24CGJOvHbUNS+sh8Sfse
+ yGpqSdoVjU9UjgkSpiJl7PWFPrXqoiNsxR6nEeXufy8q9+X4DsCVdiaomifCw1FN
+ HoP/xVUDUDBMeTAC8zseTardit4rt0Gtuk+5DuRm9otpGNSbABEBAAGJAR8EGAEC
+ AAkFAlqVcvkCGwwACgkQ1SFpjo9lVCKUOggAh8CNa+AkoEJsRCtzjW+3dJIaSk5w
+ KEpq9fVlmAcCbyIimB3NDAgGLSCTSc3JeXt5Hdgp4M0+j56lVEOtcTC0HWQYYVL2
+ 4QKv9fLypgJe5DLYtQmAyQOXNmO6P77/2KdeB1flxZiWmCDr3VJRgWseMILKb3oQ
+ 49Hfmk7HQrKOi0KaHbx0tpbUHo3uWR4H/QeQE3pCOA+ighqP3Mu3AHI/ySmWZyhc
+ kvvGambz75gXUdOb9L6eqV9lHQhFUCJznMdjCpd8HUFsbQiAaWKsFv5T5cpmBhDc
+ /MslWGpfFi+hs/ritGELl9+CiFdn6YPXULEb653V65ev8vg7NwX78ifNQw==
+ =SMUT
-----END PGP PUBLIC KEY BLOCK-----
install-sources: |
- - "deb http://65.122.57.42/repo /"
+ - "deb http://65.122.57.45:30002/opnfv /"
contrail-analytics:
charm: ./{{ ubuntu.release }}/contrail-analytics
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 0534d84..741ad20 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -21,7 +21,7 @@ virtinstall=0
maasinstall=0
usage() { echo "Usage: $0
- [-s|--sdn <nosdn|odl|opencontrail>]
+ [-s|--sdn <nosdn|odl|ocl>]
[-t|--type <noha|ha|tip>]
[-o|--openstack <ocata|pike>]
[-l|--lab <default|custom>]