Merge ~d-info-e/cloud-init:fix-user-group-doc into cloud-init:master
Proposed by
do3meli
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Chad Smith | ||||
Approved revision: | 4b892c2d1fa97bb35935f351d65c872bde513ebf | ||||
Merge reported by: | Chad Smith | ||||
Merged at revision: | b27f713ae5b4c5b38eda63758dbaeab92be13b9d | ||||
Proposed branch: | ~d-info-e/cloud-init:fix-user-group-doc | ||||
Merge into: | cloud-init:master | ||||
Diff against target: |
242 lines (+44/-44) 7 files modified
cloudinit/config/cc_users_groups.py (+14/-14) doc/examples/cloud-config-user-groups.txt (+12/-12) tests/cloud_tests/testcases/examples/including_user_groups.yaml (+1/-1) tests/cloud_tests/testcases/modules/user_groups.yaml (+1/-1) tests/data/merge_sources/expected7.yaml (+8/-8) tests/data/merge_sources/source7-1.yaml (+5/-5) tests/data/merge_sources/source7-2.yaml (+3/-3) |
||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Server Team CI bot | continuous-integration | Approve | |
Chad Smith | Approve | ||
Review via email: mp+342251@code.launchpad.net |
Commit message
correct documentation to match correct attribute name usage.
LP: #1420018
To post a comment you must log in.
this one is harder than it should be.
_normalize_users ends up fixing the '-' to '_' in all those before create_ user' gets called. So either actually works.
'distro.
Documentation and implementation in cloud-init have unfortunately been
inconsistent with '-' versus '_'.
We should absolutely strive to be consistent both in implementation
and in documentation.
So... authorized- keys' support either - or _. Lets just change everything to config/ cc_users_ groups. py to match (that is what ends up cloudinit. readthedocs. io/en/latest/ topics/ modules. html#users- and-groups
* I'm 98% certain that 'ssh-import-id' in the diff context and
'ssh-
document '_' for consistency.
Please fix those also.
* lets also update the in-module documentation in
cloudinit/
being documented at
http://