airship
/
promenade
Code Issues Proposed changes

Add lint and fmt tox jobs 

Change-Id: I487a4738bc19de52b094bb2eadbcd083c4e2d538
This commit is contained in:
Mark Burnett 2017-10-24 11:02:29 -05:00
parent f175b3f79c
commit 22e2196b7c
4 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
promenade/builder.py
View File

@ -65,7 +65,9 @@ class Builder:
script = renderer.render_template( script = renderer.render_template(
sub_config, sub_config,
template='scripts/genesis.sh', template='scripts/genesis.sh',
context={'tarball': tarball}) context={
'tarball': tarball
})
_write_script(output_dir, 'genesis.sh', script) _write_script(output_dir, 'genesis.sh', script)
@ -88,7 +90,9 @@ class Builder:
script = renderer.render_template( script = renderer.render_template(
sub_config, sub_config,
template='scripts/join.sh', template='scripts/join.sh',
context={'tarball': tarball}) context={
'tarball': tarball
})
_write_script(output_dir, _join_name(node_name), script) _write_script(output_dir, _join_name(node_name), script)

6
promenade/generator.py
View File

@ -32,9 +32,9 @@ class Generator:
'apiserver', 'apiserver',
ca='kubernetes', ca='kubernetes',
cn='apiserver', cn='apiserver',
hosts=self._service_dns('kubernetes', 'default') + [ hosts=self._service_dns('kubernetes', 'default') +
'localhost', '127.0.0.1', 'apiserver.kubernetes.promenade' ['localhost', '127.0.0.1', 'apiserver.kubernetes.promenade'] +
] + [self.config['KubernetesNetwork:kubernetes.service_ip']]) [self.config['KubernetesNetwork:kubernetes.service_ip']])
self.gen( self.gen(
'certificate', 'certificate',
'apiserver-etcd', 'apiserver-etcd',

6
promenade/pki.py
View File

@ -75,8 +75,10 @@ class PKI:
name, name,
groups=[], groups=[],
hosts=[], hosts=[],
key={'algo': 'rsa', key={
'size': 2048}): 'algo': 'rsa',
'size': 2048
}):
return json.dumps({ return json.dumps({
'CN': name, 'CN': name,
'key': key, 'key': key,

13
tox.ini
View File

@ -16,8 +16,21 @@ commands =
rm -rf docs/build rm -rf docs/build
python setup.py build_sphinx {posargs} python setup.py build_sphinx {posargs}
[testenv:fmt]
deps = yapf
commands =
yapf -ir {toxinidir}/promenade
[testenv:freeze] [testenv:freeze]
deps = -r{toxinidir}/requirements-direct.txt deps = -r{toxinidir}/requirements-direct.txt
whitelist_externals=sh whitelist_externals=sh
commands= commands=
sh -c "pip freeze | grep -v '^promenade' > {toxinidir}/requirements-frozen.txt" sh -c "pip freeze | grep -v '^promenade' > {toxinidir}/requirements-frozen.txt"
[testenv:lint]
deps =
yapf
flake8
commands =
yapf -rd {toxinidir}/promenade
flake8 {toxinidir}/promenade