phsm opened a new pull request, #10061: URL: https://github.com/apache/cloudstack/pull/10061
### Description This PR adds the VM password to the vendor_data.json generated when ConfigDrive is used. This way the ConfigDrive can be used as a full substitute for Virtual Router-based metadata servers, and it works with the ConfigDrive datasource of cloud-init. The existing config file is left for compatibility. <!--- Describe your changes in DETAIL - And how has behaviour functionally changed. --> - Renamed `writeVendorEmptyJsonFile()` to `writeVendorDataJsonFile()` as it is not always empty anymore - Overloaded the method with a password parameter - If `writeVendorDataJsonFile()` is called with the password, then it generates the vendor data containing a cloud-init snippet that contains the password, just as described here: https://cloudinit.readthedocs.io/en/latest/reference/datasources/openstack.html#vendor-data - The `writeVendorDataJsonFile()` is only called with password when the password "file" is found in the vmData array. <!-- For new features, provide link to FS, dev ML discussion etc. --> <!-- In case of bug fix, the expected and actual behaviours, steps to reproduce. --> <!-- When "Fixes: #<id>" is specified, the issue/PR will automatically be closed when this PR gets merged --> <!-- For addressing multiple issues/PRs, use multiple "Fixes: #<id>" --> <!-- Fixes: # --> <!--- ******************************************************************************* --> <!--- NOTE: AUTOMATION USES THE DESCRIPTIONS TO SET LABELS AND PRODUCE DOCUMENTATION. --> <!--- PLEASE PUT AN 'X' in only **ONE** box --> <!--- ******************************************************************************* --> ### Types of changes - [ ] Breaking change (fix or feature that would cause existing functionality to change) - [ ] New feature (non-breaking change which adds functionality) - [ ] Bug fix (non-breaking change which fixes an issue) - [x] Enhancement (improves an existing feature and functionality) - [ ] Cleanup (Code refactoring and cleanup, that may add test cases) - [ ] build/CI - [ ] test (unit or integration test code) ### Feature/Enhancement Scale or Bug Severity #### Feature/Enhancement Scale - [ ] Major - [x] Minor #### Bug Severity - [ ] BLOCKER - [ ] Critical - [ ] Major - [ ] Minor - [ ] Trivial ### Screenshots (if appropriate): ### How Has This Been Tested? <!-- Please describe in detail how you tested your changes. --> <!-- Include details of your testing environment, and the tests you ran to --> Downloaded a standard Ubuntu qcow2 image, that already has the cloud-init with ConfigDrive datasource in it: https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img The network configuration, the hostname, ssh key work, as well as the password for the user "ubuntu" is set to the Cloudstack-generated one. #### How did you try to break this feature and the system with this change? <!-- see how your change affects other areas of the code, etc. --> I don't see how it can be broken, I specifically made sure the `writeVendorEmptyJsonFile()` is only called with the password when it was found among the vmData fields. However, if you have suggestions how to test it, then I can perform those tests. <!-- Please read the [CONTRIBUTING](https://github.com/apache/cloudstack/blob/main/CONTRIBUTING.md) document --> -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@cloudstack.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
