summaryrefslogtreecommitdiff
path: root/cloudinit/CloudConfig
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2012-01-12 16:49:17 +0100
committerScott Moser <smoser@ubuntu.com>2012-01-12 16:49:17 +0100
commit029ac0b55f686180167fa3c929fb41ad3574b656 (patch)
tree1ae03c6c3b13e3d7c2cc78b36ec15ab06869d96b /cloudinit/CloudConfig
parent982856531a3498d784e3977f307a9cbf2a673977 (diff)
downloadvyos-cloud-init-029ac0b55f686180167fa3c929fb41ad3574b656.tar.gz
vyos-cloud-init-029ac0b55f686180167fa3c929fb41ad3574b656.zip
[PATCH 01/13] Fix pylint warnings W0311 (bad indentation)
From: Juerg Haefliger <juerg.haefliger@hp.com>
Diffstat (limited to 'cloudinit/CloudConfig')
-rw-r--r--cloudinit/CloudConfig/cc_chef.py4
-rw-r--r--cloudinit/CloudConfig/cc_foo.py2
-rw-r--r--cloudinit/CloudConfig/cc_resizefs.py6
-rw-r--r--cloudinit/CloudConfig/cc_update_etc_hosts.py58
4 files changed, 35 insertions, 35 deletions
diff --git a/cloudinit/CloudConfig/cc_chef.py b/cloudinit/CloudConfig/cc_chef.py
index 14960a3c..f093d0b2 100644
--- a/cloudinit/CloudConfig/cc_chef.py
+++ b/cloudinit/CloudConfig/cc_chef.py
@@ -90,9 +90,9 @@ def get_ruby_packages(version):
def install_chef_from_gems(ruby_version, chef_version = None):
cc.install_packages(get_ruby_packages(ruby_version))
if not os.path.exists('/usr/bin/gem'):
- os.symlink('/usr/bin/gem%s' % ruby_version, '/usr/bin/gem')
+ os.symlink('/usr/bin/gem%s' % ruby_version, '/usr/bin/gem')
if not os.path.exists('/usr/bin/ruby'):
- os.symlink('/usr/bin/ruby%s' % ruby_version, '/usr/bin/ruby')
+ os.symlink('/usr/bin/ruby%s' % ruby_version, '/usr/bin/ruby')
if chef_version:
subprocess.check_call(['/usr/bin/gem','install','chef',
'-v %s' % chef_version, '--no-ri',
diff --git a/cloudinit/CloudConfig/cc_foo.py b/cloudinit/CloudConfig/cc_foo.py
index aa95578f..fb14707e 100644
--- a/cloudinit/CloudConfig/cc_foo.py
+++ b/cloudinit/CloudConfig/cc_foo.py
@@ -21,4 +21,4 @@ from cloudinit.CloudConfig import per_instance
frequency = per_instance
def handle(name,cfg,cloud,log,args):
- print "hi"
+ print "hi"
diff --git a/cloudinit/CloudConfig/cc_resizefs.py b/cloudinit/CloudConfig/cc_resizefs.py
index 6615636f..d3a22fd6 100644
--- a/cloudinit/CloudConfig/cc_resizefs.py
+++ b/cloudinit/CloudConfig/cc_resizefs.py
@@ -41,9 +41,9 @@ def handle(name,cfg,cloud,log,args):
os.close(fd)
try:
- st_dev=os.stat("/").st_dev
- dev=os.makedev(os.major(st_dev),os.minor(st_dev))
- os.mknod(devpth, 0400 | stat.S_IFBLK, dev)
+ st_dev=os.stat("/").st_dev
+ dev=os.makedev(os.major(st_dev),os.minor(st_dev))
+ os.mknod(devpth, 0400 | stat.S_IFBLK, dev)
except:
if util.islxc():
log.debug("inside lxc, ignoring mknod failure in resizefs")
diff --git a/cloudinit/CloudConfig/cc_update_etc_hosts.py b/cloudinit/CloudConfig/cc_update_etc_hosts.py
index 1dc9c1e9..cf2ad046 100644
--- a/cloudinit/CloudConfig/cc_update_etc_hosts.py
+++ b/cloudinit/CloudConfig/cc_update_etc_hosts.py
@@ -49,36 +49,36 @@ def handle(name,cfg,cloud,log,args):
def update_etc_hosts(hostname, fqdn, log):
- with open('/etc/hosts', 'r') as etchosts:
- header = "# Added by cloud-init\n"
- hosts_line = "127.0.1.1\t%s %s\n" % (fqdn, hostname)
- need_write = False
- need_change = True
- new_etchosts = StringIO.StringIO()
- for line in etchosts:
- split_line = [s.strip() for s in line.split()]
- if len(split_line) < 2:
+ with open('/etc/hosts', 'r') as etchosts:
+ header = "# Added by cloud-init\n"
+ hosts_line = "127.0.1.1\t%s %s\n" % (fqdn, hostname)
+ need_write = False
+ need_change = True
+ new_etchosts = StringIO.StringIO()
+ for line in etchosts:
+ split_line = [s.strip() for s in line.split()]
+ if len(split_line) < 2:
new_etchosts.write(line)
continue
- if line == header:
+ if line == header:
continue
- ip, hosts = split_line[0], split_line[1:]
- if ip == "127.0.1.1":
- if sorted([hostname, fqdn]) == sorted(hosts):
- need_change = False
- if need_change == True:
- line = "%s%s" % (header, hosts_line)
- need_change = False
- need_write = True
- new_etchosts.write(line)
- etchosts.close()
- if need_change == True:
- new_etchosts.write("%s%s" % (header, hosts_line))
- need_write = True
- if need_write == True:
- new_etcfile = open ('/etc/hosts','wb')
- new_etcfile.write(new_etchosts.getvalue())
- new_etcfile.close()
- new_etchosts.close()
- return
+ ip, hosts = split_line[0], split_line[1:]
+ if ip == "127.0.1.1":
+ if sorted([hostname, fqdn]) == sorted(hosts):
+ need_change = False
+ if need_change == True:
+ line = "%s%s" % (header, hosts_line)
+ need_change = False
+ need_write = True
+ new_etchosts.write(line)
+ etchosts.close()
+ if need_change == True:
+ new_etchosts.write("%s%s" % (header, hosts_line))
+ need_write = True
+ if need_write == True:
+ new_etcfile = open ('/etc/hosts','wb')
+ new_etcfile.write(new_etchosts.getvalue())
+ new_etcfile.close()
+ new_etchosts.close()
+ return