diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-09-20 20:44:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-20 20:44:10 +0000 |
| commit | 3b0786b9181b944cbcc126ceb85c063924c8744c (patch) | |
| tree | 90b666b7d6c78c02a6548ff555df7f2976426315 | |
| parent | 72759c59fb710360cd55e27c6f803d2af2c149d3 (diff) | |
| parent | 62b4d6bddc724219facb0ff1da3104d6be29b7ca (diff) | |
Merge "Minor fixes to clean" into stable/euphrates
| -rw-r--r-- | .gitignore | 10 | ||||
| -rw-r--r-- | apex/clean.py | 1 | ||||
| -rw-r--r-- | apex/network/jumphost.py | 3 |
3 files changed, 5 insertions, 9 deletions
@@ -1,17 +1,11 @@ *~ *.pyc -.*.sw? -.coverage /docs_build/ /docs_output/ /releng/ -.build/ -.cache/ -ci/apex_build.log -ci/apex_deploy.log -.tox/ apex.egg-info/ /apex/tests/playbooks/*.retry coverage.xml nosetests.xml -ci/apex_clean.log +ci/*.log +.* diff --git a/apex/clean.py b/apex/clean.py index efea0ff2..9d0e648e 100644 --- a/apex/clean.py +++ b/apex/clean.py @@ -134,5 +134,6 @@ def main(): logging.info('Apex clean complete!') + if __name__ == '__main__': main() diff --git a/apex/network/jumphost.py b/apex/network/jumphost.py index 96b06cba..c28c105e 100644 --- a/apex/network/jumphost.py +++ b/apex/network/jumphost.py @@ -297,6 +297,7 @@ def remove_ovs_bridge(network): "ifcfg-{}".format(bridge)) if os.path.isfile(bridge_ifcfg_file): os.remove(bridge_ifcfg_file) - logging.debug("Bridge ifcfg file removed: {}".format) + logging.debug("Bridge ifcfg file removed: {}".format( + bridge_ifcfg_file)) else: logging.debug('Bridge ifcfg file not found') |