From 347f0d66a0a0d05385797dafac02d64b99e89f03 Mon Sep 17 00:00:00 2001 From: James Falcon Date: Mon, 22 Mar 2021 10:52:21 -0500 Subject: refresh patches against upstream/master commit bad84ad4 refresh patches against upstream/master commit bad84ad4: debian/patches/azure-apply-network-config-false.patch debian/patches/openstack-no-network-config.patch --- debian/patches/azure-apply-network-config-false.patch | 2 +- debian/patches/openstack-no-network-config.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/patches/azure-apply-network-config-false.patch b/debian/patches/azure-apply-network-config-false.patch index 65f9c46d..ea23f2a4 100644 --- a/debian/patches/azure-apply-network-config-false.patch +++ b/debian/patches/azure-apply-network-config-false.patch @@ -10,7 +10,7 @@ Forwarded: not-needed Last-Update: 2018-10-17 --- a/cloudinit/sources/DataSourceAzure.py +++ b/cloudinit/sources/DataSourceAzure.py -@@ -266,7 +266,7 @@ BUILTIN_DS_CONFIG = { +@@ -264,7 +264,7 @@ BUILTIN_DS_CONFIG = { }, 'disk_aliases': {'ephemeral0': RESOURCE_DISK_PATH}, 'dhclient_lease_file': LEASE_FILE, diff --git a/debian/patches/openstack-no-network-config.patch b/debian/patches/openstack-no-network-config.patch index 20b64951..7e49ef19 100644 --- a/debian/patches/openstack-no-network-config.patch +++ b/debian/patches/openstack-no-network-config.patch @@ -30,7 +30,7 @@ Author: Chad Smith if self.network_json == sources.UNSET: --- a/tests/unittests/test_datasource/test_openstack.py +++ b/tests/unittests/test_datasource/test_openstack.py -@@ -344,6 +344,7 @@ class TestOpenStackDataSource(test_helpe +@@ -372,6 +372,7 @@ class TestOpenStackDataSource(test_helpe settings.CFG_BUILTIN, None, helpers.Paths({'run_dir': self.tmp})) sample_json = {'links': [{'ethernet_mac_address': 'mymac'}], 'networks': [], 'services': []} -- cgit v1.2.1