Only run os-net-config if file has content

Instack undercloud allows the user to specify their own
os-net-config overrides file. This file currently cannot be empty
because it causes an exception in this puppet manifest.

This patch skips running os-net-config if the config file has no
data and allows the user a means to disable os-net-config from running
if they choose to do so.

Related bug: #1764507

Change-Id: I69eb812af2d653cb3eb29694ae29b57ebb2de53d
This commit is contained in:
Dan Prince 2018-04-24 08:55:05 -04:00
parent 971efd6be1
commit 203083e97d

View File

@ -30,6 +30,7 @@ class tripleo::network::os_net_config {
Package['openvswitch'],
Service['openvswitch'],
],
onlyif => "/bin/grep -q '[^[:space:]]' /etc/os-net-config/config.json",
notify => Exec['trigger-keepalived-restart'],
}