Backport Dmitrii's fix to 2.5. #9782
Conversation
Fix the network initialization code so that on Bionic we don't exit 0 after running netplan apply during network setup. That way users that add their own bootcmd properties still get run.
|
|
|
@jameinel We currently cannot change bootcmds via cloudinit-userdata. https://github.com/juju/juju/blob/e16b7d8/cloudconfig/userdatacfg_unix.go#L395-L401 I think it would be more precise to say that Juju's own bootcmds that run afterwards were not executed because of an early exit. It just happened to be that the proxy file rendering bootcmd was the last and only one specified. |
|
@dshcherb are you saying that the branch as it is now is broken? Or are you commenting about it being broken before? |
|
No, it's not broken, just saying that the fix was not about allowing user customizations to bootcmd to run (which are not possible via cloudinit-userdata model-config AFAIKS, we can only tune {pre,post}runcmd) - the bootcmd command that renders /etc/apt/apt.conf.d/95-juju-proxy-settings comes from the Juju code itself (https://github.com/juju/juju/blob/juju-2.5.0/cloudconfig/cloudinit/cloudinit_ubuntu.go#L302-L312) and the premature exit affected that specific command, not a user-specified command. Sorry if it was not clear from the PR description - had to type in a hurry. |
#9819 ## Description of change Another ratchet of changes in 2.5 that need to be in develop. prdesc Merge pull request #9793 from jameinel/2.5-cleanup-volumes-1800872 prdesc Merge pull request #9788 from babbageclunk/raftlease-application-leaders prdesc Merge pull request #9786 from howbazaar/2.5-move-worker prdesc Merge pull request #9782 from jameinel/2.5-network-exit-1807615 prdesc Merge pull request #9781 from timClicks/2.5 prdesc Merge pull request #9778 from anastasiamac/current-controller-saga prdesc Merge pull request #9776 from SimonRichardson/lxd-sub-acceptance-test prdesc Merge pull request #9777 from anastasiamac/storage-err-fix-machine-removal-25 prdesc Merge pull request #9759 from wallyworld/k8s-ephemeral-storage prdesc Merge pull request #9773 from achilleasa/emit-errors-for-invalid-credential-names prdesc Merge pull request #9774 from achilleasa/backport-leader-unit-support-for-juju-run prdesc Merge pull request #9764 from manadart/2.5-maas-container-inherit-props prdesc Merge pull request #9761 from Veebers/update-cloud-controller prdesc Merge pull request #9770 from hmlanigan/2.5-lxd-profile ## QA steps See individual patches. ## Documentation changes See individual patches. ## Bug reference prdesc https://bugs.launchpad.net/juju/+bug/1800872 prdesc https://bugs.launchpad.net/juju/+bug/1807615 prdesc https://bugs.launchpad.net/juju/+bug/1786140 prdesc https://bugs.launchpad.net/juju/+bug/1813079 prdesc https://bugs.launchpad.net/juju/+bug/1702538 prdesc https://bugs.launchpad.net/juju/+bug/1816826 prdesc https://bugs.launchpad.net/juju/+bug/1815636
Description of change
Fix the network initialization code so that on Bionic we don't exit 0
after running netplan apply during network setup. That way users that
add their own bootcmd properties still get run.
This is just a backport of #9751.
QA steps
You should be able to supply your own post-bootcmd and have it run on Bionic, rather than bootcmd exiting early once networking is set up.
Documentation changes
None.
Bug reference
https://bugs.launchpad.net/juju/+bug/1807615