diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-04-06 13:57:00 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-04-06 13:57:00 -0400 |
| commit | 578fed15061293ce421eec1c9c1e2e056631a734 (patch) | |
| tree | 9fbe580cabcec0d34418e4327f8794a57e76eba1 /cloudinit/config | |
| parent | eb5a4dda1fc221bf29c45eef47f0bfadec250943 (diff) | |
| download | vyos-cloud-init-578fed15061293ce421eec1c9c1e2e056631a734.tar.gz vyos-cloud-init-578fed15061293ce421eec1c9c1e2e056631a734.zip | |
fix tests and hopefully actually work
Diffstat (limited to 'cloudinit/config')
| -rw-r--r-- | cloudinit/config/cc_rh_subscription.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cloudinit/config/cc_rh_subscription.py b/cloudinit/config/cc_rh_subscription.py index 2871984a..3a113aea 100644 --- a/cloudinit/config/cc_rh_subscription.py +++ b/cloudinit/config/cc_rh_subscription.py @@ -23,11 +23,10 @@ def handle(name, cfg, _cloud, log, _args): sm = SubscriptionManager(cfg) sm.log = log if not sm.is_configured(): - log.debug("Activation key not provided, config module %s disabled.", - _name) + log.debug("%s: module not configured.", name) return None - if not sm.is_registered: + if not sm.is_registered(): try: verify, verify_msg = sm._verify_keys() if verify is not True: @@ -406,4 +405,4 @@ class SubscriptionManager(object): return True def is_configured(self): - return (self.userid and self.password) or self.activation_key + return bool((self.userid and self.password) or self.activation_key) |