net-config-multinode: make controlplane int idempotent
authorEmilien Macchi <emilien@redhat.com>
Fri, 3 Feb 2017 14:17:59 +0000 (09:17 -0500)
committerEmilien Macchi <emilien@redhat.com>
Fri, 3 Feb 2017 14:17:59 +0000 (09:17 -0500)
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

ci/common/net-config-multinode.yaml

index bf947d3..dc31235 100644 (file)
@@ -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}