summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2011-01-20 16:48:11 -0500
committerScott Moser <smoser@ubuntu.com>2011-01-20 16:48:11 -0500
commit2e2a4feb9ee26babf880e55d010b75710fb260fe (patch)
tree6789e3ec55b16a7a3972dc74a8c055edf9580aed
parentab881307ea6e1649836497acd432b0728608d7cd (diff)
downloadvyos-cloud-init-2e2a4feb9ee26babf880e55d010b75710fb260fe.tar.gz
vyos-cloud-init-2e2a4feb9ee26babf880e55d010b75710fb260fe.zip
remove updates check, as its no longer really necessary (LP: #653220)
LP: #653220
-rw-r--r--ChangeLog1
-rw-r--r--cloudinit/CloudConfig/cc_updates_check.py49
-rw-r--r--config/cloud.cfg1
3 files changed, 1 insertions, 50 deletions
diff --git a/ChangeLog b/ChangeLog
index f50aaa90..11e7e828 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,3 +2,4 @@
- change permissions of /var/log/cloud-init.log to accomodate
syslog writing to it (LP: #704509)
- rework of /var/lib/cloud layout
+ - remove updates-check (LP: #653220)
diff --git a/cloudinit/CloudConfig/cc_updates_check.py b/cloudinit/CloudConfig/cc_updates_check.py
deleted file mode 100644
index aaa2e6b0..00000000
--- a/cloudinit/CloudConfig/cc_updates_check.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# vi: ts=4 expandtab
-#
-# Copyright (C) 2009-2010 Canonical Ltd.
-#
-# Author: Scott Moser <scott.moser@canonical.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 3, as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-import cloudinit.util as util
-import cloudinit
-import os
-import time
-
-cronpre = "/etc/cron.d/cloudinit"
-
-def handle(name,cfg,cloud,log,args):
- if not util.get_cfg_option_bool(cfg, 'updates-check', True):
- return
- build_info = "/etc/cloud/build.info"
- if not os.path.isfile(build_info):
- log.warn("no %s file" % build_info)
-
- avail="%s/%s" % ( cloudinit.datadir, "available.build" )
- cmd=( "uec-query-builds", "--system-suite", "--config", "%s" % build_info,
- "--output", "%s" % avail, "is-update-available" )
- try:
- util.subp(cmd)
- except:
- log.warn("failed to execute uec-query-build for updates check")
-
- # add a cron entry for this hour and this minute every day
- try:
- cron=open("%s-%s" % (cronpre, "updates") ,"w")
- cron.write("%s root %s\n" % \
- (time.strftime("%M %H * * *"),' '.join(cmd)))
- cron.close()
- except:
- log.warn("failed to enable cron update system check")
- raise
-
diff --git a/config/cloud.cfg b/config/cloud.cfg
index 8556dc78..63a67e78 100644
--- a/config/cloud.cfg
+++ b/config/cloud.cfg
@@ -12,7 +12,6 @@ cloud_config_modules:
- grub-dpkg
- apt-update-upgrade
- puppet
- - updates-check
- disable-ec2-metadata
- runcmd
- byobu