summaryrefslogtreecommitdiff
path: root/cloudinit/config
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2014-02-12 16:05:35 -0500
committerScott Moser <smoser@ubuntu.com>2014-02-12 16:05:35 -0500
commit7204a820b561f23453820ff79a8228500bc754c9 (patch)
tree9046e12241ba9b87a7c1bf400ca0975eef93da27 /cloudinit/config
parent4d80411700ca70401cda401ee9bca799b9b8c55d (diff)
downloadvyos-cloud-init-7204a820b561f23453820ff79a8228500bc754c9.tar.gz
vyos-cloud-init-7204a820b561f23453820ff79a8228500bc754c9.zip
Add 'unverified_modules' config option and skip unverified modules
Config modules are able to declare distros that they were verified to run on by setting 'distros' as a list in the config module. Previously, if a module was configured to run and the running distro was not listed as supported, it would run anyway, and a warning would be written. Now, we change the behavior to skip those modules. The distro (or user) can specify that a given list of modules should run anyway by declaring the 'unverified_modules' config variable. run_once modules will be run without this filter (ie, expecting that the user explicitly wanted to run it).
Diffstat (limited to 'cloudinit/config')
-rw-r--r--cloudinit/config/cc_ssh_import_id.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/cloudinit/config/cc_ssh_import_id.py b/cloudinit/config/cc_ssh_import_id.py
index 50d96e15..76c1663d 100644
--- a/cloudinit/config/cc_ssh_import_id.py
+++ b/cloudinit/config/cc_ssh_import_id.py
@@ -26,9 +26,8 @@ from cloudinit import distros as ds
from cloudinit import util
import pwd
-# The ssh-import-id only seems to exist on ubuntu (for now)
# https://launchpad.net/ssh-import-id
-distros = ['ubuntu']
+distros = ['ubuntu', 'debian']
def handle(_name, cfg, cloud, log, args):