Merge pull request #54537 from juju-solutions/bug/fix-except

Automatic merge from submit-queue (batch tested with PRs 54537, 54558). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Address lint errors on Juju charms **What this PR does / why we need it**: Two minor code style errors were recently introduced to the Juju charms of CDK. This blocks their build. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: **Special notes for your reviewer**: **Release note**: ```NONE ```

Merge pull request #54537 from juju-solutions/bug/fix-except
d8736073 · Kubernetes Submit Queue · GitHub · 7f991a3b · 42702518 · d8736073
Commit d8736073 authored Oct 25, 2017 by Kubernetes Submit Queue Committed by GitHub Oct 25, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

kubernetes_master.py ...ju/layers/kubernetes-master/reactive/kubernetes_master.py +1 -1

kubernetes_worker.py ...ju/layers/kubernetes-worker/reactive/kubernetes_worker.py +1 -1

No files found.
--- a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
+++ b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
@@ -703,7 +703,7 @@ def ceph_storage(ceph_admin):
        cmd = ['kubectl', 'apply', '-f', '/tmp/ceph-secret.yaml']
        check_call(cmd)
        os.remove('/tmp/ceph-secret.yaml')
-    except:
+    except: # NOQA
        # the enlistment in kubernetes failed, return and prepare for re-exec
        return


--- a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
+++ b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
@@ -37,7 +37,7 @@ from charms.kubernetes.flagmanager import FlagManager
 from charms.reactive.helpers import data_changed, any_file_changed
 from charms.templating.jinja2 import render

-from charmhelpers.core import hookenv, unitdata
+from charmhelpers.core import hookenv
 from charmhelpers.core.host import service_stop, service_restart
 from charmhelpers.contrib.charmsupport import nrpe