aboutsummaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2017-02-03 09:17:59 -0500
committerEmilien Macchi <emilien@redhat.com>2017-02-03 09:17:59 -0500
commitf48c66509984a29169a1437593b4e288f1eb506c (patch)
tree72d4ebdc4628c9e20dbf72ca55e609854a828eee /ci
parentec24ed7dd82fd4c1553085719e369b545c4beedd (diff)
net-config-multinode: make controlplane int idempotent
When doing a stack-update, it will try to create the control plane interface again. Add this conditional so the interface is not created if already exist. Note: this code has been taken from tripleo-ci and is consistent with how multinode jobs are currently tested. Co-Authored-By: James Slagle <jslagle@redhat.com> Co-Authored-By: Steven Hardy <shardy@redhat.com> Co-Authored-By: Mathieu Bultel <mbultel@redhat.com> Change-Id: I773fdf5359cead6961b595e3c8192b02406452b7 Related-Bug: #1661412
Diffstat (limited to 'ci')
-rw-r--r--ci/common/net-config-multinode.yaml4
1 files changed, 3 insertions, 1 deletions
diff --git a/ci/common/net-config-multinode.yaml b/ci/common/net-config-multinode.yaml
index bf947d3..dc31235 100644
--- a/ci/common/net-config-multinode.yaml
+++ b/ci/common/net-config-multinode.yaml
@@ -47,7 +47,9 @@ resources:
str_replace:
template: |
#!/bin/bash
- ip addr add CONTROLPLANEIP/CONTROLPLANESUBNETCIDR dev $bridge_name
+ if ! ip addr show dev $bridge_name | grep CONTROLPLANEIP/CONTROLPLANESUBNETCIDR; then
+ ip addr add CONTROLPLANEIP/CONTROLPLANESUBNETCIDR dev $bridge_name
+ fi
params:
CONTROLPLANEIP: {get_param: ControlPlaneIp}
CONTROLPLANESUBNETCIDR: {get_param: ControlPlaneSubnetCidr}