Merge lp:~harlowja/cloud-init/query-tool-is-back into lp:~cloud-init-dev/cloud-init/trunk
Proposed by
Scott Moser
Status: | Rejected |
---|---|
Rejected by: | Chad Smith |
Proposed branch: | lp:~harlowja/cloud-init/query-tool-is-back |
Merge into: | lp:~cloud-init-dev/cloud-init/trunk |
Diff against target: |
395 lines (+216/-33) 6 files modified
Requires (+1/-0) bin/cloud-init (+36/-10) cloudinit/pprint.py (+107/-0) cloudinit/sources/__init__.py (+30/-0) cloudinit/stages.py (+37/-21) cloudinit/util.py (+5/-2) |
To merge this branch: | bzr merge lp:~harlowja/cloud-init/query-tool-is-back |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Server Team CI bot | continuous-integration | Needs Fixing | |
cloud-init Commiters | Pending | ||
Review via email: mp+123394@code.launchpad.net |
To post a comment you must log in.
Unmerged revisions
- 649. By Joshua Harlow
-
Fix some pylint issues and update the datasource query
to just return a map describing the database and use the
borrowed pprint code to show this map in a nice CLI format.Also allow for printing of the init configuration as well
as the datasource via the query entrypoint. - 648. By Joshua Harlow
-
Updated with no encryption and
clearing out of the userdata/raw fields
to prevent access when querying. - 647. By Joshua Harlow
-
Start adding a query entrypoint with encryption using
aes of the userdata (raw and not raw) if possible using
the provided users (currently root) private ssh key sha256
hash as the secret (openssl was tried, didn't work due to
key file formats being all different).
I'd like to have the query tool back. Some comments:
* I'd like some cmdline mechanism to request a single variable 'cloud-init query --instance-id' or something like that. Saving that, at very least well formatted data needs to be output for '--what=ds'. As it exists right now, I dont think its machine parsable output really. I kind of liked hte way it was in revno 649 in that respect.
Basically, I want people to be able to use this as a replacement for 'ec2metadata --instance-id' or 'ec2metadata --local-hostname'. I dont think doing this consistently across data sources is easy, but I'd like to try.
* 'self._ write_to_ cache(safe= False)' is more readable than below, which just looks odd. to_cache( False) to_cache( True)
+ self._write_
+ self._write_
* seems like unused change for 'hash_blob' creeped in.
* random newline in 'Requires' was added.
* cloudinit/pprint.py has 'vim: not consistent with other 'vi:'. I'm not opposed to that change, but I'd prefer it done once all over if we wanted that.
# vim: tabstop=4 shiftwidth=4 softtabstop=4