From 822fc407d1cc58ea388df86436137b8631f85c4a Mon Sep 17 00:00:00 2001 From: Johannes Grassler Date: Thu, 3 Oct 2024 18:13:03 +0200 Subject: [PATCH 1/2] Add CloudCIX to the data source list. --- debian/cloud-init-base.templates | 6 +++--- debian/po/templates.pot | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/cloud-init-base.templates b/debian/cloud-init-base.templates index 5dbc4984baa..05538213775 100644 --- a/debian/cloud-init-base.templates +++ b/debian/cloud-init-base.templates @@ -1,8 +1,8 @@ Template: cloud-init-base/datasources Type: multiselect -Default: NoCloud, ConfigDrive, OpenNebula, DigitalOcean, Azure, AltCloud, OVF, MAAS, GCE, OpenStack, CloudSigma, SmartOS, Bigstep, Scaleway, AliYun, Ec2, CloudStack, Hetzner, IBMCloud, Oracle, Exoscale, RbxCloud, UpCloud, VMware, Vultr, LXD, NWCS, Akamai, WSL, None -Choices-C: NoCloud, ConfigDrive, OpenNebula, DigitalOcean, Azure, AltCloud, OVF, MAAS, GCE, OpenStack, CloudSigma, SmartOS, Bigstep, Scaleway, AliYun, Ec2, CloudStack, Hetzner, IBMCloud, Oracle, Exoscale, RbxCloud, UpCloud, VMware, Vultr, LXD, NWCS, Akamai, WSL, None -__Choices: NoCloud: Reads info from /var/lib/cloud/seed only, ConfigDrive: Reads data from Openstack Config Drive, OpenNebula: read from OpenNebula context disk, DigitalOcean: reads data from Droplet datasource, Azure: read from MS Azure cdrom. Requires walinux-agent, AltCloud: config disks for RHEVm and vSphere, OVF: Reads data from OVF Transports, MAAS: Reads data from Ubuntu MAAS, GCE: google compute metadata service, OpenStack: native openstack metadata service, CloudSigma: metadata over serial for cloudsigma.com, SmartOS: Read from SmartOS metadata service, Bigstep: Bigstep metadata service, Scaleway: Scaleway metadata service, AliYun: Alibaba metadata service, Ec2: reads data from EC2 Metadata service, CloudStack: Read from CloudStack metadata service, Hetzner: Hetzner Cloud, IBMCloud: IBM Cloud. Previously softlayer or bluemix., Oracle: Oracle Compute Infrastructure, Exoscale: Exoscale, RbxCloud: HyperOne and Rootbox platforms, UpCloud: UpCloud, VMware: reads data from guestinfo table or env vars, Vultr: Vultr Cloud, LXD: Reads /dev/lxd/sock representation of instance data, NWCS: NWCS, Akamai: Akamai and Linode platforms, WSL: Windows Subsystem for Linux, None: Failsafe datasource +Default: NoCloud, ConfigDrive, OpenNebula, DigitalOcean, Azure, AltCloud, OVF, MAAS, GCE, OpenStack, CloudSigma, SmartOS, Bigstep, Scaleway, AliYun, Ec2, CloudStack, Hetzner, IBMCloud, Oracle, Exoscale, RbxCloud, UpCloud, VMware, Vultr, LXD, NWCS, Akamai, WSL, CloudCIX, None +Choices-C: NoCloud, ConfigDrive, OpenNebula, DigitalOcean, Azure, AltCloud, OVF, MAAS, GCE, OpenStack, CloudSigma, SmartOS, Bigstep, Scaleway, AliYun, Ec2, CloudStack, Hetzner, IBMCloud, Oracle, Exoscale, RbxCloud, UpCloud, VMware, Vultr, LXD, NWCS, Akamai, WSL, CloudCIX, None +__Choices: NoCloud: Reads info from /var/lib/cloud/seed only, ConfigDrive: Reads data from Openstack Config Drive, OpenNebula: read from OpenNebula context disk, DigitalOcean: reads data from Droplet datasource, Azure: read from MS Azure cdrom. Requires walinux-agent, AltCloud: config disks for RHEVm and vSphere, OVF: Reads data from OVF Transports, MAAS: Reads data from Ubuntu MAAS, GCE: google compute metadata service, OpenStack: native openstack metadata service, CloudSigma: metadata over serial for cloudsigma.com, SmartOS: Read from SmartOS metadata service, Bigstep: Bigstep metadata service, Scaleway: Scaleway metadata service, AliYun: Alibaba metadata service, Ec2: reads data from EC2 Metadata service, CloudStack: Read from CloudStack metadata service, Hetzner: Hetzner Cloud, IBMCloud: IBM Cloud. Previously softlayer or bluemix., Oracle: Oracle Compute Infrastructure, Exoscale: Exoscale, RbxCloud: HyperOne and Rootbox platforms, UpCloud: UpCloud, VMware: reads data from guestinfo table or env vars, Vultr: Vultr Cloud, LXD: Reads /dev/lxd/sock representation of instance data, NWCS: NWCS, Akamai: Akamai and Linode platforms, WSL: Windows Subsystem for Linux, CloudCIX: Reads from CloudCIX metadata service, None: Failsafe datasource _Description: Which data sources should be searched? Cloud-init supports searching different "Data Sources" for information that it uses to configure a cloud instance. diff --git a/debian/po/templates.pot b/debian/po/templates.pot index b7221d2a493..fc09c726c84 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -191,6 +191,12 @@ msgstr "" msgid "WSL: Windows Subsystem for Linux" msgstr "" +#. Type: multiselect +#. Choices +#: ../cloud-init-base.templates:1001 +msgid "CloudCIX: Reads from CloudCIX metadata service" +msgstr "" + #. Type: multiselect #. Choices #: ../cloud-init-base.templates:1001 From 06297e593605a947fa5ab5958db32ac8be7868c8 Mon Sep 17 00:00:00 2001 From: Johannes Grassler Date: Thu, 3 Oct 2024 21:01:54 +0200 Subject: [PATCH 2/2] Add changelog entry on CloudCIX. --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 5f081ba5aca..27c1cad58c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ cloud-init (24.4~4gc9dce94d-0ubuntu1) UNRELEASED; urgency=medium * d/cloud-init-base.templates: + Add warning about image portability to dpkg-reconfigure. * d/NEWS: add news about cloud-specific packages + * d/po/templates.pot and cloud-init.templates: enable CloudCIX by default. -- Alberto Contreras Fri, 27 Sep 2024 10:10:16 +0200