diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | cloudinit/DataSourceMaaS.py | 4 | ||||
| -rw-r--r-- | cloudinit/__init__.py | 2 | ||||
| -rw-r--r-- | config/cloud.cfg | 2 |
4 files changed, 4 insertions, 5 deletions
@@ -28,6 +28,7 @@ - DataSourceNoCloud: support seed from external disk of ISO or vfat (LP: #857378) - DataSourceNoCloud: support inserting /etc/network/interfaces - DataSourceMaaS: add data source for Ubuntu Machines as a Service (MaaS) (LP: #942061) + - DataSourceCloudStack: add support for CloudStack datasource [Cosmin Luta] - add option 'apt_pipelining' to address issue with S3 mirrors (LP: #948461) [Ben Howard] 0.6.2: diff --git a/cloudinit/DataSourceMaaS.py b/cloudinit/DataSourceMaaS.py index fd9d6316..ea42c1fb 100644 --- a/cloudinit/DataSourceMaaS.py +++ b/cloudinit/DataSourceMaaS.py @@ -1,10 +1,8 @@ # vi: ts=4 expandtab # -# Copyright (C) 2009-2010 Canonical Ltd. -# Copyright (C) 2012 Hewlett-Packard Development Company, L.P. +# Copyright (C) 2012 Canonical Ltd. # # Author: Scott Moser <scott.moser@canonical.com> -# Author: Juerg Hafliger <juerg.haefliger@hp.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 diff --git a/cloudinit/__init__.py b/cloudinit/__init__.py index 9f188766..37447a31 100644 --- a/cloudinit/__init__.py +++ b/cloudinit/__init__.py @@ -29,7 +29,7 @@ cfg_env_name = "CLOUD_CFG" cfg_builtin = """ log_cfgs: [] -datasource_list: ["NoCloud", "ConfigDrive", "OVF", "MaaS", "Ec2" ] +datasource_list: ["NoCloud", "ConfigDrive", "OVF", "MaaS", "Ec2", "CloudStack"] def_log_file: /var/log/cloud-init.log syslog_fix_perms: syslog:adm """ diff --git a/config/cloud.cfg b/config/cloud.cfg index 8cf76dcd..983b0ba6 100644 --- a/config/cloud.cfg +++ b/config/cloud.cfg @@ -1,7 +1,7 @@ user: ubuntu disable_root: 1 preserve_hostname: False -# datasource_list: ["NoCloud", "ConfigDrive", "OVF", "MaaS", "Ec2", "CloudStack" ] +# datasource_list: ["NoCloud", "ConfigDrive", "OVF", "MaaS", "Ec2", "CloudStack"] cloud_init_modules: - bootcmd |