T2117: Cloud-init updated to 22.1

Merged with 22.1 tag from the upstream Cloud-init repository.

Our modules were slightly modified for compatibility with the new
version.

4 files changed, 15 insertions, 3 deletions

diff --git a/doc/sources/ovf/README b/doc/sources/ovf/README
index e3ef12e0..3e0b366b 100644
--- a/doc/sources/ovf/README
+++ b/doc/sources/ovf/README
@@ -53,7 +53,7 @@ box, follow the steps below.
   You can change that at the grub prompt if you'd like by editing the
   kernel entry.  Otherwise, to see progress you'll need to switch
   to the serial console.  In kvm graphic mode, you do that by clicking
-  in the window and then pressing pressing 'ctrl-alt-3'.  For information
+  in the window and then pressing 'ctrl-alt-3'.  For information
   on how to do that in virtualbox or kvm curses, see the relevant
   documentation.
 
diff --git a/doc/sources/ovf/example/ovf-env.xml b/doc/sources/ovf/example/ovf-env.xml
index 13e8f104..e5f4e262 100644
--- a/doc/sources/ovf/example/ovf-env.xml
+++ b/doc/sources/ovf/example/ovf-env.xml
@@ -41,6 +41,14 @@
         -->

         <Property oe:key="user-data" oe:value="IyEvYmluL3NoCmVjaG8gImhpIHdvcmxkIgo="/>

         <Property oe:key="password" oe:value="passw0rd"/>

+        <!--

+        network-config is optional.

+        The value for network-config is to be base64 encoded.

+        It will be decoded, and then processed normally as network-config.

+        Set ovf-env.xml to VMware guestinfo.ovfEnv by below command:

+        'vmware-rpctool "info-set guestinfo.ovfEnv `cat ./ovf-env.xml`"' 

+        -->

+        <Property oe:key="network-config" oe:value="bmV0d29yazoKICB2ZXJzaW9uOiAyCiAgZXRoZXJuZXRzOgogICAgbmljczoKICAgICAgbWF0Y2g6CiAgICAgICAgbmFtZTogZXRoKgogICAgICBkaGNwNDogeWVz"/>

     </PropertySection>

 

 </Environment>

diff --git a/doc/sources/ovf/example/ubuntu-server.ovf b/doc/sources/ovf/example/ubuntu-server.ovf
index 846483a1..bc5327ed 100644
--- a/doc/sources/ovf/example/ubuntu-server.ovf
+++ b/doc/sources/ovf/example/ubuntu-server.ovf
@@ -48,8 +48,12 @@
           <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. The value for network-config has to be base64 encoded.</Description>
+      </Property>
     </ProductSection>
-    <VirtualHardwareSection>
+    <VirtualHardwareSection ovf:transport="iso">
       <Info>Virtual hardware requirements</Info>
       <System>
         <vssd:ElementName>Virtual Hardware Family</vssd:ElementName>
diff --git a/doc/sources/ovf/make-iso b/doc/sources/ovf/make-iso
index 91d0e2e5..e46642bf 100755
--- a/doc/sources/ovf/make-iso
+++ b/doc/sources/ovf/make-iso
@@ -28,7 +28,7 @@ Usage() {
 	cat <<EOF
 Usage: ${0##*/} ovf-env.xml.tmpl [user-data-file]
 
-   create an an ovf transport iso with ovf-env.xml.tmpl
+   create an ovf transport iso with ovf-env.xml.tmpl
    as ovf-env.xml on the iso.
 
    if user-data-file is given, the file's contents will be base64 encoded