diff options
| author | Chad Smith <chad.smith@canonical.com> | 2018-06-21 14:32:29 -0600 |
|---|---|---|
| committer | Chad Smith <chad.smith@canonical.com> | 2018-06-21 14:32:29 -0600 |
| commit | 606f75aa35fb25bac50d783c1bfebcb7c31dde65 (patch) | |
| tree | 8d2bd714a84c031c54bbfa735b662dfef56fc48f /debian/patches/openstack-no-network-config.patch | |
| parent | ba53ceb5a8a30c10951ec3ac49b8d6ebbe09a524 (diff) | |
| download | vyos-cloud-init-606f75aa35fb25bac50d783c1bfebcb7c31dde65.tar.gz vyos-cloud-init-606f75aa35fb25bac50d783c1bfebcb7c31dde65.zip | |
refresh patches against master commit 2d6e4219
refresh patches against master commit 2d6e4219:
debian/patches/azure-use-walinux-agent.patch
debian/patches/ds-identify-behavior-xenial.patch
debian/patches/openstack-no-network-config.patch
Diffstat (limited to 'debian/patches/openstack-no-network-config.patch')
| -rw-r--r-- | debian/patches/openstack-no-network-config.patch | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/debian/patches/openstack-no-network-config.patch b/debian/patches/openstack-no-network-config.patch index 67493548..d6560f4e 100644 --- a/debian/patches/openstack-no-network-config.patch +++ b/debian/patches/openstack-no-network-config.patch @@ -15,7 +15,7 @@ Author: Chad Smith <chad.smith@canonical.com> --- a/cloudinit/sources/DataSourceOpenStack.py +++ b/cloudinit/sources/DataSourceOpenStack.py -@@ -97,10 +97,9 @@ class DataSourceOpenStack(openstack.SourceMixin, sources.DataSource): +@@ -97,10 +97,9 @@ class DataSourceOpenStack(openstack.Sour if self._network_config != sources.UNSET: return self._network_config @@ -28,10 +28,9 @@ Author: Chad Smith <chad.smith@canonical.com> self._network_config = None return self._network_config if self.network_json == sources.UNSET: - --- a/tests/unittests/test_datasource/test_openstack.py +++ b/tests/unittests/test_datasource/test_openstack.py -@@ -345,6 +345,7 @@ class TestOpenStackDataSource(test_helpers.HttprettyTestCase): +@@ -345,6 +345,7 @@ class TestOpenStackDataSource(test_helpe settings.CFG_BUILTIN, None, helpers.Paths({'run_dir': self.tmp})) sample_json = {'links': [{'ethernet_mac_address': 'mymac'}], 'networks': [], 'services': []} @@ -39,4 +38,3 @@ Author: Chad Smith <chad.smith@canonical.com> ds_os.network_json = sample_json with test_helpers.mock.patch(mock_path) as m_convert_json: m_convert_json.return_value = example_cfg - |