aboutsummaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-03 18:33:46 +0000
committerGerrit Code Review <review@openstack.org>2017-02-03 18:33:46 +0000
commit340a3dffbb423322ef28a99a893771bed12e53aa (patch)
treef5ba65c9ca9ce656437cb08558722dedf2f22326 /ci
parent87af02d67336ff26c47f67c40df23dad9e66b7fd (diff)
parentf48c66509984a29169a1437593b4e288f1eb506c (diff)
Merge "net-config-multinode: make controlplane int idempotent"
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 bf947d3e..dc31235a 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}