Commit 38629d20 authored by Ilias Tsitsimpis's avatar Ilias Tsitsimpis

snf-deploy: pep8 fixes

parent 07b78af0
......@@ -38,8 +38,6 @@ distribute_setup.use_setuptools()
import os
import sys
from distutils.util import convert_path
from fnmatch import fnmatchcase
from setuptools import setup, find_packages
HERE = os.path.abspath(os.path.normpath(os.path.dirname(__file__)))
......@@ -65,30 +63,30 @@ INSTALL_REQUIRES = [
]
setup(
name = 'snf-deploy',
version = VERSION,
license = 'BSD',
url = 'http://code.grnet.gr/',
description = SHORT_DESCRIPTION,
long_description = SHORT_DESCRIPTION,
classifiers = CLASSIFIERS,
name='snf-deploy',
version=VERSION,
license='BSD',
url='http://code.grnet.gr/',
description=SHORT_DESCRIPTION,
long_description=SHORT_DESCRIPTION,
classifiers=CLASSIFIERS,
author='Synnefo development team',
author_email='synnefo-devel@googlegroups.com',
maintainer='Synnefo development team',
maintainer_email='synnefo-devel@googlegroups.com',
packages = PACKAGES,
package_dir= {'': PACKAGES_ROOT},
include_package_data = True,
zip_safe = False,
packages=PACKAGES,
package_dir={'': PACKAGES_ROOT},
include_package_data=True,
zip_safe=False,
install_requires = INSTALL_REQUIRES,
install_requires=INSTALL_REQUIRES,
dependency_links = ['http://docs.dev.grnet.gr/pypi'],
dependency_links=['http://docs.dev.grnet.gr/pypi'],
entry_points={
'console_scripts': [
'snf-deploy=snfdeploy:main',
],
},
'console_scripts': [
'snf-deploy=snfdeploy:main',
],
},
)
This diff is collapsed.
#!/usr/bin/python
import json
import time
import ipaddr
import os
......@@ -10,10 +9,7 @@ import sys
import re
import random
import subprocess
import shutil
import imp
import tempfile
from snfdeploy import massedit
HEADER = '\033[95m'
......@@ -85,7 +81,7 @@ class Env(object):
def update_packages(self, os):
for section in self.conf.files[os]:
self.evaluate(os, section)
self.evaluate(os, section)
def evaluate(self, filename, section):
for k, v in self.conf.get_section(filename, section):
......@@ -152,7 +148,6 @@ class Conf(object):
def get_ganeti(self, cluster_name):
self.files["ganeti"] = [cluster_name]
def __init__(self, args):
self.confdir = args.confdir
self.get_ganeti(args.cluster_name)
......@@ -220,7 +215,7 @@ def check_pidfile(pidfile):
pass
def randomMAC():
def random_mac():
mac = [0x52, 0x54, 0x56,
random.randint(0x00, 0xff),
random.randint(0x00, 0xff),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment