~ubuntu-branches/ubuntu/saucy/cloud-init/saucy

« back to all changes in this revision

Viewing changes to cloudinit/cloud.py

  • Committer: Package Import Robot
  • Author(s): Scott Moser
  • Date: 2012-08-31 17:04:06 UTC
  • mto: (245.3.1 raring)
  • mto: This revision was merged to the branch mainline in revision 290.
  • Revision ID: package-import@ubuntu.com-20120831170406-0dbj84kjdfcn4ktr
* New upstream snapshot.
  * support using launch-index (ami-launch-index) (LP: #1023177)
  * usergroup related fixes (LP: #1041384, #1044044, #1044508)

Show diffs side-by-side

added added

removed removed

Lines of Context:
70
70
        return fn
71
71
 
72
72
    # The rest of thes are just useful proxies
73
 
    def get_userdata(self):
74
 
        return self.datasource.get_userdata()
 
73
    def get_userdata(self, apply_filter=True):
 
74
        return self.datasource.get_userdata(apply_filter)
75
75
 
76
76
    def get_instance_id(self):
77
77
        return self.datasource.get_instance_id()
78
78
 
 
79
    @property
 
80
    def launch_index(self):
 
81
        return self.datasource.launch_index
 
82
 
79
83
    def get_public_ssh_keys(self):
80
84
        return self.datasource.get_public_ssh_keys()
81
85