~ubuntu-branches/ubuntu/precise/cloud-init/precise-updates

« back to all changes in this revision

Viewing changes to cloudinit/DataSource.py

  • Committer: Package Import Robot
  • Author(s): Scott Moser
  • Date: 2012-03-09 16:37:01 UTC
  • mfrom: (174.1.9 precise)
  • Revision ID: package-import@ubuntu.com-20120309163701-w1ntss7kxz8jsy1p
Tags: 0.6.3~bzr539-0ubuntu1
* New upstream snapshot.
  * add ability to configure Acquire::http::Pipeline-Depth via
    cloud-config setting 'apt_pipelining' (LP: #942061)
  * if cloud-config settings removed default certificats
    (remove-defaults), then seed package ca-certificates to not
    install new ones on upgrade.
  * run-parts now uses internal implementation rather than
    separate command.
  * add MaaS datasource (LP: #942061)
* debian/cloud-init.postinst: address population of apt_pipeline 
  setting on installation.
* debian/cloud-init.postinst: support configuring cloud-init
  maas datasource via preseed values cloud-init/maas-metadata-url and
  cloud-init/maas-credentials. (LP: #942061)
* debian/cloud-init.postinst: support for (LP: #924375)

Show diffs side-by-side

added added

removed removed

Lines of Context:
72
72
        if isinstance(self.metadata['public-keys'], str):
73
73
            return([self.metadata['public-keys'], ])
74
74
 
 
75
        if isinstance(self.metadata['public-keys'], list):
 
76
            return(self.metadata['public-keys'])
 
77
 
75
78
        for _keyname, klist in self.metadata['public-keys'].items():
76
79
            # lp:506332 uec metadata service responds with
77
80
            # data that makes boto populate a string for 'klist' rather