diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-07-24 11:10:21 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2018-07-24 11:10:21 +0000 |
commit | c51c387f8c7d1c9ee03e35822c896432e4d646a0 (patch) | |
tree | bf4c9730e994174b706d03645d83bec27be138e2 /mcp/salt-formulas | |
parent | 24572d5956da62b1492c053cac82037b266a6739 (diff) | |
parent | 54acfffcbc655b72912eef4c1b2133a3b8feec1d (diff) |
Merge "[salt-formulas] opnfv: Drop obsolete route_wrapper"
Diffstat (limited to 'mcp/salt-formulas')
-rw-r--r-- | mcp/salt-formulas/opnfv/route_wrapper.sls | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/mcp/salt-formulas/opnfv/route_wrapper.sls b/mcp/salt-formulas/opnfv/route_wrapper.sls deleted file mode 100644 index 6132f317e..000000000 --- a/mcp/salt-formulas/opnfv/route_wrapper.sls +++ /dev/null @@ -1,27 +0,0 @@ -############################################################################## -# Copyright (c) 2018 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## -/usr/local/sbin/route: - file.managed: - - contents: | - #!/bin/sh - - # Workaround salt-managed routes breaking ifup when route already exists - route_binary='/sbin/route' - route_output=$("${route_binary}" "$@" 2>&1) - route_return=$? - - if [ -n "${route_output}" ]; then - if echo "${route_output}" | grep -q 'SIOCADDRT: File exists'; then - exit 0 - fi - echo "${route_output}" - fi - exit "${route_return}" - - user: root - - group: root - - mode: 755 |