From 6948ea32c113e92541bc340fcd892d342587aa2d Mon Sep 17 00:00:00 2001
From: Gabriel Mainberger <gabisoft@freesurf.ch>
Date: Wed, 12 Jan 2022 12:56:19 +0100
Subject: [PATCH 1/2] Add DatasourceOVF network-config propery to Ubuntu OVF
 example

Cloud-init includes the capability to take the network-config from a
separate key. This removes the need to merge the network config in
the user-data and make it more transparent in some cases.

Reference:
https://github.com/canonical/cloud-init/blob/42b938e8ff4c50833ff7b8f5acc1d9ab3f43ab18/cloudinit/sources/DataSourceOVF.py#L557
---
 doc/sources/ovf/example/ubuntu-server.ovf | 4 ++++
 tools/.github-cla-signers                 | 1 +
 2 files changed, 5 insertions(+)

diff --git a/doc/sources/ovf/example/ubuntu-server.ovf b/doc/sources/ovf/example/ubuntu-server.ovf
index 846483a188b..8dd7240304d 100644
--- a/doc/sources/ovf/example/ubuntu-server.ovf
+++ b/doc/sources/ovf/example/ubuntu-server.ovf
@@ -48,6 +48,10 @@
           <Label>Default User's password</Label>
           <Description>If set, the default user's password will be set to this value to allow password based login.  The password will be good for only a single login.  If set to the string 'RANDOM' then a random password will be generated, and written to the console.</Description>
       </Property>
+      <Property ovf:key="network-config" ovf:type="string" ovf:userConfigurable="true">
+          <Label>Encoded network-config</Label>
+          <Description>This field is optional. It will be taken if no network configuration is set in user-data. The value for network-config has to be base64 encoded.</Description>
+      </Property>
     </ProductSection>
     <VirtualHardwareSection>
       <Info>Virtual hardware requirements</Info>
diff --git a/tools/.github-cla-signers b/tools/.github-cla-signers
index 62e6017addf..eebcdc9b987 100644
--- a/tools/.github-cla-signers
+++ b/tools/.github-cla-signers
@@ -53,6 +53,7 @@ manuelisimo
 marlluslustosa
 matthewruffell
 maxnet
+megian
 mitechie
 nazunalika
 nicolasbock

From 08c22afd7f381c43bd4ac148f65e0390e5073db9 Mon Sep 17 00:00:00 2001
From: Megian <gabisoft@freesurf.ch>
Date: Fri, 14 Jan 2022 23:44:17 +0100
Subject: [PATCH 2/2] Remove OVF network configuration example priority
 description

Co-authored-by: James Falcon <therealfalcon@gmail.com>
---
 doc/sources/ovf/example/ubuntu-server.ovf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sources/ovf/example/ubuntu-server.ovf b/doc/sources/ovf/example/ubuntu-server.ovf
index 8dd7240304d..d61adf3598b 100644
--- a/doc/sources/ovf/example/ubuntu-server.ovf
+++ b/doc/sources/ovf/example/ubuntu-server.ovf
@@ -50,7 +50,7 @@
       </Property>
       <Property ovf:key="network-config" ovf:type="string" ovf:userConfigurable="true">
           <Label>Encoded network-config</Label>
-          <Description>This field is optional. It will be taken if no network configuration is set in user-data. The value for network-config has to be base64 encoded.</Description>
+          <Description>This field is optional. The value for network-config has to be base64 encoded.</Description>
       </Property>
     </ProductSection>
     <VirtualHardwareSection>