diff options
| author | Scott Moser <smoser@ubuntu.com> | 2015-08-04 21:58:39 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2015-08-04 21:58:39 -0500 |
| commit | 02cc30c4ba60050c15c56927fa1bad50299ed8c3 (patch) | |
| tree | 2cfc53a09270be59bf3ba256673edb3890fdf424 | |
| parent | 0550f95ccb31c9cad18c4a5851eeca53e371dd6b (diff) | |
| parent | 328cc7fbaf4d60b51193fb8c14e52d8c6f3273f2 (diff) | |
| download | vyos-cloud-init-02cc30c4ba60050c15c56927fa1bad50299ed8c3.tar.gz vyos-cloud-init-02cc30c4ba60050c15c56927fa1bad50299ed8c3.zip | |
merge from trunk
| -rw-r--r-- | cloudinit/config/cc_rh_subscription.py | 6 | ||||
| -rw-r--r-- | cloudinit/config/cc_rsyslog.py | 1 | ||||
| -rw-r--r-- | cloudinit/sources/DataSourceCloudStack.py | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/cloudinit/config/cc_rh_subscription.py b/cloudinit/config/cc_rh_subscription.py index 6da26d25..3b30c47e 100644 --- a/cloudinit/config/cc_rh_subscription.py +++ b/cloudinit/config/cc_rh_subscription.py @@ -130,9 +130,9 @@ class SubscriptionManager(object): ((not self.auto_attach) or (util.is_false(str(self.auto_attach)))): - no_auto = "The service-level key must be used in conjunction with "\ - "the auto-attach key. Please re-run with auto-attach: "\ - "True" + no_auto = ("The service-level key must be used in conjunction " + "with the auto-attach key. Please re-run with " + "auto-attach: True") return False, no_auto return True, None diff --git a/cloudinit/config/cc_rsyslog.py b/cloudinit/config/cc_rsyslog.py index a0132d28..b8642d65 100644 --- a/cloudinit/config/cc_rsyslog.py +++ b/cloudinit/config/cc_rsyslog.py @@ -130,6 +130,7 @@ HOST_PORT_RE = re.compile( '(([[](?P<bracket_addr>[^\]]*)[\]])|(?P<addr>[^:]*))' '([:](?P<port>[0-9]+))?$') + def reload_syslog(command=DEF_RELOAD, systemd=False): service = 'rsyslog' if command == DEF_RELOAD: diff --git a/cloudinit/sources/DataSourceCloudStack.py b/cloudinit/sources/DataSourceCloudStack.py index d0cac5bb..64595020 100644 --- a/cloudinit/sources/DataSourceCloudStack.py +++ b/cloudinit/sources/DataSourceCloudStack.py @@ -41,10 +41,12 @@ class CloudStackPasswordServerClient(object): """ Implements password fetching from the CloudStack password server. - http://cloudstack-administration.readthedocs.org/en/latest/templates.html#adding-password-management-to-your-templates + http://cloudstack-administration.readthedocs.org/ + en/latest/templates.html#adding-password-management-to-your-templates has documentation about the system. This implementation is following that found at - https://github.com/shankerbalan/cloudstack-scripts/blob/master/cloud-set-guest-password-debian + https://github.com/shankerbalan/cloudstack-scripts/ + blob/master/cloud-set-guest-password-debian """ def __init__(self, virtual_router_address): |