summaryrefslogtreecommitdiff
path: root/cloudinit
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2015-03-05 12:26:26 -0500
committerScott Moser <smoser@ubuntu.com>2015-03-05 12:26:26 -0500
commitd05f1b00e2498343c03ba2de543990fffde8a02f (patch)
tree275d316f5fb4708be434cb1e4901226749f31eb9 /cloudinit
parent46da1b83fba8d1e70dc58dbbf18697216b1eb1e3 (diff)
downloadvyos-cloud-init-d05f1b00e2498343c03ba2de543990fffde8a02f.tar.gz
vyos-cloud-init-d05f1b00e2498343c03ba2de543990fffde8a02f.zip
do not raise exception on non-existant channel.ini file
Diffstat (limited to 'cloudinit')
-rw-r--r--cloudinit/config/cc_snappy.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/config/cc_snappy.py b/cloudinit/config/cc_snappy.py
index 32fbc9f6..8d73dca3 100644
--- a/cloudinit/config/cc_snappy.py
+++ b/cloudinit/config/cc_snappy.py
@@ -84,7 +84,7 @@ def system_is_snappy():
# channel.ini is configparser loadable.
# snappy will move to using /etc/system-image/config.d/*.ini
# this is certainly not a perfect test, but good enough for now.
- content = util.load_file("/etc/system-image/channel.ini")
+ content = util.load_file("/etc/system-image/channel.ini", quiet=True)
if 'ubuntu-core' in content.lower():
return True
if os.path.isdir("/etc/system-image/config.d/"):