Merge ~smoser/cloud-init:dhclient-hook-on-azure-only into cloud-init:master
Status: | Merged |
---|---|
Merged at revision: | 64522efe710faf6fa1615dbb60a2fc4cc8a7c278 |
Proposed branch: | ~smoser/cloud-init:dhclient-hook-on-azure-only |
Merge into: | cloud-init:master |
Diff against target: |
127 lines (+59/-9) 4 files modified
systemd/cloud-init-generator (+5/-0) tools/hook-dhclient (+20/-5) tools/hook-network-manager (+19/-4) tools/hook-rhel.sh (+15/-0) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
cloud-init Commiters | Pending | ||
Review via email: mp+303303@code.launchpad.net |
Commit message
dhclient-hook: only run if on azure and cloud-init is enabled.
This adds some function to the generator to maintain the presense
of a flag file '/run/cloud-
is enabled.
Then, in the hook scripts, only run the cloud-init dhclient-hook
if we are on azure and cloud-init is enabled. The test for is_azure
currently only checks to see that the board vendor is Microsoft, not
actually that we are on azure.
The value of this additional code is that then dhclient having run
does not task the system with the load of cloud-init.
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.