diff options
| author | Nate House nathan.house@rackspace.com <> | 2014-02-04 16:09:09 -0600 |
|---|---|---|
| committer | Nate House nathan.house@rackspace.com <> | 2014-02-04 16:09:09 -0600 |
| commit | 6e0aaf44c7a869d35a962a2d60be2d833023d4ec (patch) | |
| tree | 2cf2bf8727e389c53e25190becb2ba44ac2ffd9d /cloudinit/config/cc_salt_minion.py | |
| parent | 6922fc8294e38ee0780e9d74da7d3ec010a3cd3c (diff) | |
| parent | 0efeb26736ddae2967c14a9440088594da32070d (diff) | |
| download | vyos-cloud-init-6e0aaf44c7a869d35a962a2d60be2d833023d4ec.tar.gz vyos-cloud-init-6e0aaf44c7a869d35a962a2d60be2d833023d4ec.zip | |
Merge gentoo branch and updated set-password to support systemctl
Diffstat (limited to 'cloudinit/config/cc_salt_minion.py')
| -rw-r--r-- | cloudinit/config/cc_salt_minion.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cloudinit/config/cc_salt_minion.py b/cloudinit/config/cc_salt_minion.py index 53013dcb..b48762c8 100644 --- a/cloudinit/config/cc_salt_minion.py +++ b/cloudinit/config/cc_salt_minion.py @@ -22,6 +22,7 @@ from cloudinit import util def handle(name, cfg, cloud, log, _args): + # If there isn't a salt key in the configuration don't do anything if 'salt_minion' not in cfg: log.debug(("Skipping module named %s," |