Merge pull request #45494 from ktsakalozos/bug/fix-lint
Automatic merge from submit-queue (batch tested with PRs 45070, 45821, 45732, 45494, 45789) Fix lint errors in juju kubernetes master and e2e charms **What this PR does / why we need it**: Fixes style error in the Juju charms **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ``` Code style fixes in Juju charms ```
This commit is contained in:
commit
fd5146f193
@ -14,14 +14,11 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
import os
|
|
||||||
|
|
||||||
from charms import layer
|
from charms import layer
|
||||||
from charms.layer import snap
|
from charms.layer import snap
|
||||||
|
|
||||||
from charms.reactive import hook
|
from charms.reactive import hook
|
||||||
from charms.reactive import is_state
|
from charms.reactive import is_state
|
||||||
from charms.reactive import remove_state
|
|
||||||
from charms.reactive import set_state
|
from charms.reactive import set_state
|
||||||
from charms.reactive import when
|
from charms.reactive import when
|
||||||
from charms.reactive import when_not
|
from charms.reactive import when_not
|
||||||
@ -30,7 +27,6 @@ from charmhelpers.core import hookenv
|
|||||||
|
|
||||||
from shlex import split
|
from shlex import split
|
||||||
|
|
||||||
from subprocess import call
|
|
||||||
from subprocess import check_call
|
from subprocess import check_call
|
||||||
from subprocess import check_output
|
from subprocess import check_output
|
||||||
|
|
||||||
|
@ -441,7 +441,6 @@ def addons_ready():
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@when('loadbalancer.available', 'certificates.ca.available',
|
@when('loadbalancer.available', 'certificates.ca.available',
|
||||||
'certificates.client.cert.available')
|
'certificates.client.cert.available')
|
||||||
def loadbalancer_kubeconfig(loadbalancer, ca, client):
|
def loadbalancer_kubeconfig(loadbalancer, ca, client):
|
||||||
|
12
cluster/juju/layers/kubernetes-master/tox.ini
Normal file
12
cluster/juju/layers/kubernetes-master/tox.ini
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
[tox]
|
||||||
|
skipsdist=True
|
||||||
|
envlist = py34, py35
|
||||||
|
skip_missing_interpreters = True
|
||||||
|
|
||||||
|
[testenv]
|
||||||
|
commands = py.test -v
|
||||||
|
deps =
|
||||||
|
-r{toxinidir}/requirements.txt
|
||||||
|
|
||||||
|
[flake8]
|
||||||
|
exclude=docs
|
Loading…
Reference in New Issue
Block a user