diff options
| author |   Dan Prince <dprince@redhat.com> | 2016-12-11 14:54:16 -0500 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2017-01-06 20:01:14 -0500 |
| commit | b1fe2e8d60ad3dcfeec858539343be57115dd698 (patch) | |
| tree | 9dd232ab6e7345ac8d3ff38a1155b6414b92e7fc /network | |
| parent | 10044ba2afe6e33ca22ef656ec298203a485b550 (diff) | |
Template and role support for the undercloud
Add a new roles data YAML file and environment to help
create the undercloud via t-h-t.
Partially-implements: blueprint heat-undercloud
Change-Id: I36df7fa86c2ff40026d59f02248af529a4a81861
Diffstat (limited to 'network')
| -rwxr-xr-x | network/scripts/run-os-net-config.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/network/scripts/run-os-net-config.sh b/network/scripts/run-os-net-config.sh index e65f922a..a7dbedc7 100755 --- a/network/scripts/run-os-net-config.sh +++ b/network/scripts/run-os-net-config.sh @@ -108,7 +108,9 @@ EOF_CAT } if [ -n '$network_config' ]; then - trap configure_safe_defaults EXIT + if [ -z "${disable_configure_safe_defaults:-''}" ]; then + trap configure_safe_defaults EXIT + fi mkdir -p /etc/os-net-config # Note these variables come from the calling heat SoftwareConfig |