Merge ~chad.smith/cloud-init:ubuntu/artful into cloud-init:ubuntu/artful

[Chad Smith]

Sync upstream release 18.3 into artful.
Apply debian/patches/openstack-no-network-config.patch to retain openstack network config ignoring network_data.json

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:81f2e7358551a2aa4851cf74f44cc0ee9a44faa2
https://jenkins.ubuntu.com/server/job/cloud-init-ci/117/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

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

review: Approve (continuous-integration)

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:0bb961d0481e0158c0ef115f718a0f4ebcafdcea
https://jenkins.ubuntu.com/server/job/cloud-init-ci/119/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    FAILED: Ubuntu LTS: Build

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

review: Needs Fixing (continuous-integration)

diff --git a/debian/changelog b/debian/changelog
index 57c4454..e8db6f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ cloud-init (18.2-4-g05926e48-0ubuntu1~17.10.3) UNRELEASED; urgency=medium
 
   * debian/rules: update version.version_string to contain packaged version.
     (LP: #1770712)
+  * debian/patches/openstack-no-network-config.patch
+    add patch to ignore Openstack network_config from network_data.json by
+    default
 
- -- Scott Moser <[e-mail]>  Mon, 04 Jun 2018 10:14:17 -0400
+ -- Chad Smith <[e-mail]>  Thu, 21 Jun 2018 14:22:02 -0600
 
 cloud-init (18.2-4-g05926e48-0ubuntu1~17.10.2) artful-proposed; urgency=medium
 
diff --git a/debian/patches/openstack-no-network-config.patch b/debian/patches/openstack-no-network-config.patch
 new file mode 100644
index 0000000..6749354
--- /dev/null
+++ b/debian/patches/openstack-no-network-config.patch
@@ -0,0 +1,42 @@
+Description: Fallback network config instead of network_data.json for OpenStack
+ To make this acceptable as a SRU we keep the same behavior as is
+ in the stable release which is to generate network for fallback nic
+ only.
+ .
+ In this series, OpenStack datasource can optionally generate
+ network_config from network_data.json if the datasource is configured
+ with a file like /etc/cloud.cfg.d/openstack-net.cfg:
+ .
+ datasource:
+   OpenStack:
+     apply_network_config: true
+Forwarded: not-needed
+Author: Chad Smith <[e-mail]>
+
+--- a/cloudinit/sources/DataSourceOpenStack.py
++++ b/cloudinit/sources/DataSourceOpenStack.py
+@@ -97,10 +97,9 @@ class DataSourceOpenStack(openstack.SourceMixin, sources.DataSource):
+         if self._network_config != sources.UNSET:
+             return self._network_config
+ 
+-        # RELEASE_BLOCKER: SRU to Xenial and Artful SRU should not provide
++        # Xenial, Artful and Bionic will not provide
+         # network_config by default unless configured in /etc/cloud/cloud.cfg*.
+-        # Patch Xenial and Artful before release to default to False.
+-        if util.is_false(self.ds_cfg.get('apply_network_config', True)):
++        if util.is_false(self.ds_cfg.get('apply_network_config', False)):
+             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):
+             settings.CFG_BUILTIN, None, helpers.Paths({'run_dir': self.tmp}))
+         sample_json = {'links': [{'ethernet_mac_address': 'mymac'}],
+                        'networks': [], 'services': []}
++        ds_os.ds_cfg = {'apply_network_config': True}  # Default is False
+         ds_os.network_json = sample_json
+         with test_helpers.mock.patch(mock_path) as m_convert_json:
+             m_convert_json.return_value = example_cfg
+
diff --git a/debian/patches/series b/debian/patches/series
 new file mode 100644
index 0000000..2ce72fb
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+openstack-no-network-config.patch