diff options
| author |   Stuart Mackie <wsmackie@juniper.net> | 2018-04-11 14:54:06 -0400 |
|---|---|---|
| committer | Stuart Mackie <wsmackie@juniper.net> | 2018-04-11 18:58:50 +0000 |
| commit | 266a4fd08bef19fca930cbbb1d45f5639b87d3c0 (patch) | |
| tree | 6cf198a7b967afe636dbfe36d539f6e926525392 /ci/03-maasdeploy.sh | |
| parent | f1b6b2867e4e907cb84ea4670ad32f36bddcbf6c (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>
Diffstat (limited to 'ci/03-maasdeploy.sh')
| -rwxr-xr-x | ci/03-maasdeploy.sh | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh index 869d97e4..d10e9a30 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 |