From b1fe2e8d60ad3dcfeec858539343be57115dd698 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Sun, 11 Dec 2016 14:54:16 -0500 Subject: 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 --- network/scripts/run-os-net-config.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'network/scripts') 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 -- cgit 1.2.3-korg