Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Enable mistral to run under mod_wsgi"
[apex-tripleo-heat-templates.git]
/
ci
/
common
/
net-config-multinode.yaml
diff --git
a/ci/common/net-config-multinode.yaml
b/ci/common/net-config-multinode.yaml
index
49a0688
..
f7e250e
100644
(file)
--- a/
ci/common/net-config-multinode.yaml
+++ b/
ci/common/net-config-multinode.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
2015-04-30
+heat_template_version:
pike
description: >
Software Config to drive os-net-config for a simple bridge configured
description: >
Software Config to drive os-net-config for a simple bridge configured
@@
-47,7
+47,9
@@
resources:
str_replace:
template: |
#!/bin/bash
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}
params:
CONTROLPLANEIP: {get_param: ControlPlaneIp}
CONTROLPLANESUBNETCIDR: {get_param: ControlPlaneSubnetCidr}