Merge ~chad.smith/cloud-init:cleanup/remove-azure-hotplug-yaml into cloud-init:master

Proposed by Chad Smith
Status: Merged
Approved by: Chad Smith
Approved revision: 1c9cd17782243d73e98ab4fbfda37ebb892c9dea
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~chad.smith/cloud-init:cleanup/remove-azure-hotplug-yaml
Merge into: cloud-init:master
Diff against target: 21 lines (+2/-2)
1 file modified
cloudinit/sources/DataSourceAzure.py (+2/-2)
Reviewer Review Type Date Requested Status
Scott Moser Approve
Server Team CI bot continuous-integration Approve
Review via email: mp+357423@code.launchpad.net

Commit message

azure: remove /etc/netplan/90-hotplug-azure.yaml when net from IMDS

There was a typo in the seeded filename s/azure-hotplug/hotplug-azure/.

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:1c9cd17782243d73e98ab4fbfda37ebb892c9dea
https://jenkins.ubuntu.com/server/job/cloud-init-ci/405/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/405/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ryan Harper (raharper) wrote :

Does this affect the SRU? did we miss

Revision history for this message
Chad Smith (chad.smith) wrote :

> Does this affect the SRU? did we miss
Yes and no, I found it during SRU testing, but the matching algorithm doesn't adversely affect the configured dhcp on each device so I didn't block SRU because of this.

Revision history for this message
Scott Moser (smoser) wrote :

looks fine to me.
thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py
2index d0358e9..9ba2909 100644
3--- a/cloudinit/sources/DataSourceAzure.py
4+++ b/cloudinit/sources/DataSourceAzure.py
5@@ -57,7 +57,7 @@ IMDS_URL = "http://169.254.169.254/metadata/"
6 # List of static scripts and network config artifacts created by
7 # stock ubuntu suported images.
8 UBUNTU_EXTENDED_NETWORK_SCRIPTS = [
9- '/etc/netplan/90-azure-hotplug.yaml',
10+ '/etc/netplan/90-hotplug-azure.yaml',
11 '/usr/local/sbin/ephemeral_eth.sh',
12 '/etc/udev/rules.d/10-net-device-added.rules',
13 '/run/network/interfaces.ephemeral.d',
14@@ -1202,7 +1202,7 @@ def maybe_remove_ubuntu_network_config_scripts(paths=None):
15 additional interfaces which get attached by a customer at some point
16 after initial boot. Since the Azure datasource can now regenerate
17 network configuration as metadata reports these new devices, we no longer
18- want the udev rules or netplan's 90-azure-hotplug.yaml to configure
19+ want the udev rules or netplan's 90-hotplug-azure.yaml to configure
20 networking on eth1 or greater as it might collide with cloud-init's
21 configuration.
22

Subscribers

People subscribed via source and target branches