Merge ~smoser/cloud-init:feature/feature-flag-v2 into cloud-init:master

[Scott Moser]

advertise network config v2 support (NETWORK_CONFIG_V2) in features.

ef18b8ac4c added support for handing network config v2 (aka netplan
format). This just adds that feature to the list of supported features.

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

FAILED: Continuous integration, rev:266e9da8d5be9b3f696643aa5ce7942e0610d806
https://jenkins.ubuntu.com/server/job/cloud-init-ci/150/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/150/console
    FAILURE: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/150/console
    FAILURE: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/150/console
    FAILURE: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-s390x/150/console
    FAILURE: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/150/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:f1372061424bdd82e98b5bf24eba3ad61fb15b14
https://jenkins.ubuntu.com/server/job/cloud-init-ci/152/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/152/console
    FAILURE: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/152/console
    FAILURE: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/152/console
    FAILURE: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-s390x/152/console
    FAILURE: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/152/console

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

review: Needs Fixing (continuous-integration)

[Scott Moser (smoser)]

addressed Ryan's review comments.

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

FAILED: Continuous integration, rev:e3c669fa7d07ea33e23d5e13a6cdab104e84d1a2
https://jenkins.ubuntu.com/server/job/cloud-init-ci/153/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/153/console
    FAILURE: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/153/console
    FAILURE: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/153/console
    FAILURE: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-s390x/153/console
    FAILURE: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/153/console

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

review: Needs Fixing (continuous-integration)

[Ryan Harper (raharper)]

review: Approve

diff --git a/cloudinit/version.py b/cloudinit/version.py
index e61597d..dff4af0 100644
--- a/cloudinit/version.py
+++ b/cloudinit/version.py
@@ -9,6 +9,8 @@ __VERSION__ = "0.7.9"
 FEATURES = [
     # supports network config version 1
     'NETWORK_CONFIG_V1',
+    # supports network config version 2 (netplan)
+    'NETWORK_CONFIG_V2',
 ]
 
 
diff --git a/tests/unittests/test_version.py b/tests/unittests/test_version.py
new file mode 100644
index 0000000..1662ce0
--- /dev/null
+++ b/tests/unittests/test_version.py
@@ -0,0 +1,14 @@
+# This file is part of cloud-init. See LICENSE file for license information.
+
+from .helpers import CiTestCase
+from cloudinit import version
+
+
+class TestExportsFeatures(CiTestCase):
+    def test_has_network_config_v1(self):
+        self.assertIn('NETWORK_CONFIG_V1', version.FEATURES)
+
+    def test_has_network_config_v2(self):
+        self.assertIn('NETWORK_CONFIG_V2', version.FEATURES)
+
+# vi: ts=4 expandtab