diff options
| -rw-r--r-- | cloudinit/config/cc_seed_random.py | 36 | ||||
| -rw-r--r-- | cloudinit/distros/__init__.py | 8 | ||||
| -rw-r--r-- | cloudinit/distros/debian.py | 1 | ||||
| -rw-r--r-- | cloudinit/distros/rhel.py | 1 | ||||
| -rw-r--r-- | cloudinit/sources/DataSourceConfigDrive.py | 7 | ||||
| -rw-r--r-- | config/cloud.cfg | 1 |
6 files changed, 42 insertions, 12 deletions
diff --git a/cloudinit/config/cc_seed_random.py b/cloudinit/config/cc_seed_random.py new file mode 100644 index 00000000..5d9890d5 --- /dev/null +++ b/cloudinit/config/cc_seed_random.py @@ -0,0 +1,36 @@ +# vi: ts=4 expandtab +# +# Copyright (C) 2013 Yahoo! Inc. +# +# Author: Joshua Harlow <harlowja@yahoo-inc.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/>. + +from cloudinit.settings import PER_INSTANCE + +frequency = PER_INSTANCE + + +def handle(name, cfg, cloud, log, _args): + random_seed = None + # Prefer metadata over cfg for random_seed + for src in (cloud.datasource.metadata, cfg): + if not src: + continue + tmp_random_seed = src.get('random_seed') + if tmp_random_seed and isinstance(tmp_random_seed, (str, basestring)): + random_seed = tmp_random_seed + break + if random_seed: + log.debug("%s: setting random seed", name) + cloud.distro.set_random_seed(random_seed) diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py index 8cffb0ee..5642b529 100644 --- a/cloudinit/distros/__init__.py +++ b/cloudinit/distros/__init__.py @@ -52,7 +52,7 @@ class Distro(object): ci_sudoers_fn = "/etc/sudoers.d/90-cloud-init-users" hostname_conf_fn = "/etc/hostname" tz_zone_dir = "/usr/share/zoneinfo" - random_seed_fn = None + random_seed_fn = '/dev/urandom' def __init__(self, name, cfg, paths): self._paths = paths @@ -171,11 +171,13 @@ class Distro(object): return distros def set_random_seed(self, seed): - if not self.random_seed_fn: + if not self.random_seed_fn or not os.path.exists(self.random_seed_fn): raise IOError("No random seed filename provided for %s" % (self.name)) + if not seed: + raise IOError("Unable to set empty random seed") # Ensure we only write 512 bytes worth - util.write_file(self.random_seed_fn, seed[0:512], mode=0600) + util.append_file(self.random_seed_fn, seed[0:512]) def update_hostname(self, hostname, fqdn, prev_hostname_fn): applying_hostname = hostname diff --git a/cloudinit/distros/debian.py b/cloudinit/distros/debian.py index db4afc76..8fe49cbe 100644 --- a/cloudinit/distros/debian.py +++ b/cloudinit/distros/debian.py @@ -44,7 +44,6 @@ class Distro(distros.Distro): network_conf_fn = "/etc/network/interfaces" tz_conf_fn = "/etc/timezone" tz_local_fn = "/etc/localtime" - random_seed_fn = "/var/lib/urandom/random-seed" def __init__(self, name, cfg, paths): distros.Distro.__init__(self, name, cfg, paths) diff --git a/cloudinit/distros/rhel.py b/cloudinit/distros/rhel.py index 96df9ae2..30195384 100644 --- a/cloudinit/distros/rhel.py +++ b/cloudinit/distros/rhel.py @@ -49,7 +49,6 @@ class Distro(distros.Distro): network_script_tpl = '/etc/sysconfig/network-scripts/ifcfg-%s' resolve_conf_fn = "/etc/resolv.conf" tz_local_fn = "/etc/localtime" - random_seed_fn = "/var/lib/random-seed" def __init__(self, name, cfg, paths): distros.Distro.__init__(self, name, cfg, paths) diff --git a/cloudinit/sources/DataSourceConfigDrive.py b/cloudinit/sources/DataSourceConfigDrive.py index af205d86..4f437244 100644 --- a/cloudinit/sources/DataSourceConfigDrive.py +++ b/cloudinit/sources/DataSourceConfigDrive.py @@ -59,13 +59,6 @@ class ConfigDriveHelper(object): write_files(files) except IOError: util.logexc(LOG, "Failed writing files") - random_seed = util.get_cfg_by_path(data, ('metadata', 'random_seed')) - if random_seed is not None: - LOG.debug("Writing random seed") - try: - self.distro.set_random_seed(random_seed) - except IOError: - util.logexc(LOG, "Failed writing random seed") class DataSourceConfigDrive(sources.DataSource): diff --git a/config/cloud.cfg b/config/cloud.cfg index b61b8a7d..cce1f376 100644 --- a/config/cloud.cfg +++ b/config/cloud.cfg @@ -24,6 +24,7 @@ preserve_hostname: false # The modules that run in the 'init' stage cloud_init_modules: - migrator + - seed_random - bootcmd - write-files - growpart |