diff options
| author | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:27 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:27 -0400 |
| commit | 19c68239f17ca4d8f7938fdaca7fb027df52d41e (patch) | |
| tree | 491711526f9bcde85e80ad3a017f40f8cb70cf73 | |
| parent | 2aa6148e486c6fb0ac7443dcdac05e0eca104ac2 (diff) | |
| download | cloud-init-git-ubuntu/0.6.3_bzr519-0ubuntu1.tar.gz | |
Import version 0.6.3~bzr519-0ubuntu1ubuntu/0.6.3_bzr519-0ubuntu1
Imported using git-dsc-commit.
| -rw-r--r-- | debian/changelog | 17 | ||||
| -rw-r--r-- | debian/cloud-init.config | 2 | ||||
| -rw-r--r-- | debian/cloud-init.templates | 6 | ||||
| -rw-r--r-- | debian/control | 3 |
4 files changed, 23 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index e3f4caa0..932406ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +cloud-init (0.6.3~bzr519-0ubuntu1) precise; urgency=low + + * New upstream snapshot. + - [Mike Milner] add support for managing CA Certificates (LP: #915232) + - in ci-info lines, use '.' to for empty field for easier machine reading + - support empty lines in "#include" files (LP: #923043) + - [Jef Baeur] support configuration of salt minions Bauer) (LP: #927795) + - DataSourceOVF: only search for OVF data on ISO9660 filesystems (LP: #898373) + - DataSourceConfigDrive: support getting data from openstack config drive + (LP: #857378) + - [Juerg Haefliger] formating and pylint cleanups + * increase timeouts for initial config check for metadata service + to address slow metadata service in openstack + * add awareness of ConfigDrive data source + + -- Scott Moser <smoser@ubuntu.com> Thu, 16 Feb 2012 17:27:05 -0500 + cloud-init (0.6.3~bzr502-0ubuntu1) precise; urgency=low * New upstream snapshot. diff --git a/debian/cloud-init.config b/debian/cloud-init.config index e2899a22..713cc967 100644 --- a/debian/cloud-init.config +++ b/debian/cloud-init.config @@ -19,7 +19,7 @@ hasEc2Md() { local url="http://169.254.169.254/2009-04-04/meta-data/instance-id" i="" if command -v wget >/dev/null 2>&1; then - local tout="--connect-timeout .5 --read-timeout .5 --tries 1" + local tout="--connect-timeout 5 --read-timeout 5 --tries 1" i=$(wget "${url}" ${tout} -O - 2>/dev/null) || : elif command -v curl >/dev/null 2>&1; then i=$(curl "${url}" --max-time 1) || : diff --git a/debian/cloud-init.templates b/debian/cloud-init.templates index fa06ee45..2b3a4b0a 100644 --- a/debian/cloud-init.templates +++ b/debian/cloud-init.templates @@ -1,8 +1,8 @@ Template: cloud-init/datasources Type: multiselect -Default: NoCloud, OVF -Choices-C: NoCloud, OVF, Ec2 -Choices: NoCloud: Reads info from /var/lib/cloud/seed only, OVF: Reads data from OVF Transports, Ec2: reads data from EC2 Metadata service +Default: NoCloud, ConfigDrive, OVF +Choices-C: NoCloud, ConfigDrive, OVF, Ec2 +Choices: NoCloud: Reads info from /var/lib/cloud/seed only, ConfigDrive: Reads data from Openstack Config Drive, OVF: Reads data from OVF Transports, Ec2: reads data from EC2 Metadata service Description: Which data sources should be searched? Cloud-init supports searching different "Data Sources" for information that it uses to configure a cloud instance. diff --git a/debian/control b/debian/control index 6e4b5639..db372d8e 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,8 @@ Build-Depends: cdbs, pyflakes, pylint, python (>= 2.6.6-3~), - python-nose + python-nose, + python-mocker, XS-Python-Version: all Standards-Version: 3.9.2 |