cc_puppet: support AIO installations and more #960
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GabrielNagy
force-pushed
the
puppet-module-updates
branch
4 times, most recently
from
0ec6ace
to
eb21195
Compare
|
Update: Puppet Labs has signed the Canonical CLA as an organization |
GabrielNagy
force-pushed
the
puppet-module-updates
branch
2 times, most recently
from
92f3ea2
to
7bbd10c
Compare
luchihoratiu
approved these changes
Aug 9, 2021
BobosilaVictor
approved these changes
Aug 9, 2021
GabrielNagy
force-pushed
the
puppet-module-updates
branch
from
7bbd10c
to
6282092
Compare
|
Hey @TheRealFalcon, it'd be great to get this reviewed/merged. We validated this internally and everything works as expected, let me know if there's anything else I can do to get the PR merged! Thanks! 😄 |
TheRealFalcon
requested changes
Aug 9, 2021
There was a problem hiding this comment.
Thanks for the submission. Overall this change is good. I left some comments inline, but most are fairly minor.
I noticed that the CLA has been signed on behalf of the company, but additionally any contributor needs to be added (alphabetically) to the CLA signers file. The full details are described in the last bullet point of the documentation. Currently you only need to add yourself, but feel free to add the other puppet contributors if you have them.
GabrielNagy
force-pushed
the
puppet-module-updates
branch
3 times, most recently
from
e29da06
to
7e8f661
Compare
- update the puppet module to support AIO installations by setting `install_type` to `aio` - make the install collection configurable through the `collection` parameter; by default the rolling `puppet` collection will be used, which installs the latest version) - when `install_type` is `aio`, puppetlabs repos will be purged after installation; set `cleanup` to `False` to prevent this - AIO installations are performed by downloading and executing a shell script; the URL for this script can be overridden using the `aio_install_url` parameter - make it possible to run puppet agent after installation/configuration via the `exec` key - by default, puppet agent will run with the `--test` argument; this can be overridden via the `exec_args` key
TheRealFalcon
pushed a commit
to TheRealFalcon/cloud-init
that referenced
this pull request
Aug 10, 2021
- update the puppet module to support AIO installations by setting `install_type` to `aio` - make the install collection configurable through the `collection` parameter; by default the rolling `puppet` collection will be used, which installs the latest version) - when `install_type` is `aio`, puppetlabs repos will be purged after installation; set `cleanup` to `False` to prevent this - AIO installations are performed by downloading and executing a shell script; the URL for this script can be overridden using the `aio_install_url` parameter - make it possible to run puppet agent after installation/configuration via the `exec` key - by default, puppet agent will run with the `--test` argument; this can be overridden via the `exec_args` key
TheRealFalcon
added a commit
to TheRealFalcon/cloud-init
that referenced
this pull request
Aug 12, 2021
Certain versions of python/httpretty don't work correctly using https URIs. canonical#960 recently added httpretty tests using https. This commit replaces the httpretty tests that were failing on https with mocks of readurl instead.
blackboxsw
pushed a commit
that referenced
this pull request
Aug 13, 2021
* Replace broken httpretty tests with mock Certain versions of python/httpretty don't work correctly using https URIs. #960 recently added httpretty tests using https. This commit replaces the httpretty tests that were failing on https with mocks of readurl instead.
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed Commit Message
Additional Context
This was requested on a ticket in the Puppet JIRA: https://tickets.puppetlabs.com/browse/PUP-10926.
The plan is to sign the CLA as an organization, but I opened the PR early to get some review if possible.
Test Steps
Apart from unit tests, I used an Ubuntu 18.04 machine with QEMU to validate the module functionality; used the following to replace the puppet module and restart the VM:
virsh shutdown bionic sleep 1 rm snapshot.img qemu-img create -f qcow2 -b bionic-server-cloudimg-amd64.img snapshot.img virt-copy-in -a snapshot.img ~/prepo/cloud-init/cloudinit/config/cc_puppet.py /usr/lib/python3/dist-packages/cloudinit/config cloud-localds user-data.img user-data virsh start bionicChecklist: