cloud-init

Merge ~smoser/cloud-init:ubuntu/devel-enable-hetzner into cloud-init:ubuntu/devel

  1. Git
  2. lp:~smoser/cloud-init
  3. ubuntu/devel-enable-hetzner
  4. Merge into ubuntu/devel
Proposed by Scott Moser
Status: Merged
Approved by: Chad Smith
Approved revision: d0222217d2fa157937713af6d065d82c57bae96b
Merged at revision: 200e535c5797d8ed4ed33afc7734c662a505f4b7
Proposed branch: ~smoser/cloud-init:ubuntu/devel-enable-hetzner
Merge into: cloud-init:ubuntu/devel
Diff against target: 30 lines (+9/-3)
2 files modified
debian/changelog (+6/-0)
debian/cloud-init.templates (+3/-3)
Reviewer Review Type Date Requested Status
Chad Smith Approve
Server Team CI bot continuous-integration Approve
Review via email: mp+341679@code.launchpad.net

Commit message

debian/cloud-init.templates: Enable Hetzner Cloud datasource.

Description of the change

see commit message

To post a comment you must log in.
Revision history for this message
Scott Moser (smoser) wrote :

Related hetzner datasource branch:
 https://code.launchpad.net/~lp-markusschade/cloud-init/+git/cloud-init/+merge/338439

Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:d0222217d2fa157937713af6d065d82c57bae96b
https://jenkins.ubuntu.com/server/job/cloud-init-ci/885/
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/885/rebuild

review: Approve (continuous-integration)
Revision history for this message
Chad Smith (chad.smith) :
review: Approve
Revision history for this message
Chad Smith (chad.smith) wrote :

Might need to fixup changelog if https://code.launchpad.net/~chad.smith/cloud-init/+git/cloud-init/+merge/341778 lands before this

Revision history for this message
Chad Smith (chad.smith) wrote :

I'm +1 on you bumping your changelog commit to 26-g685f9901-0ubuntu2 if you end up doing that.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index f225d52..74bd94b 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,9 @@
6+cloud-init (18.1-23-gde34dc7c-0ubuntu2) UNRELEASED; urgency=medium
7+
8+ * debian/cloud-init.templates: Enable Hetzner Cloud datasource.
9+
10+ -- Scott Moser <smoser@ubuntu.com> Mon, 19 Mar 2018 15:40:59 -0400
11+
12 cloud-init (18.1-23-gde34dc7c-0ubuntu1) bionic; urgency=medium
13
14 * New upstream snapshot.
15diff --git a/debian/cloud-init.templates b/debian/cloud-init.templates
16index 5ed37f7..ec77329 100644
17--- a/debian/cloud-init.templates
18+++ b/debian/cloud-init.templates
19@@ -1,8 +1,8 @@
20 Template: cloud-init/datasources
21 Type: multiselect
22-Default: NoCloud, ConfigDrive, OpenNebula, DigitalOcean, Azure, AltCloud, OVF, MAAS, GCE, OpenStack, CloudSigma, SmartOS, Bigstep, Scaleway, AliYun, Ec2, CloudStack, None
23-Choices-C: NoCloud, ConfigDrive, OpenNebula, DigitalOcean, Azure, AltCloud, OVF, MAAS, GCE, OpenStack, CloudSigma, SmartOS, Bigstep, Scaleway, AliYun, Ec2, CloudStack, None
24-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, None: Failsafe datasource
25+Default: NoCloud, ConfigDrive, OpenNebula, DigitalOcean, Azure, AltCloud, OVF, MAAS, GCE, OpenStack, CloudSigma, SmartOS, Bigstep, Scaleway, AliYun, Ec2, CloudStack, Hetzner, None
26+Choices-C: NoCloud, ConfigDrive, OpenNebula, DigitalOcean, Azure, AltCloud, OVF, MAAS, GCE, OpenStack, CloudSigma, SmartOS, Bigstep, Scaleway, AliYun, Ec2, CloudStack, Hetzner, None
27+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, None: Failsafe datasource
28 Description: Which data sources should be searched?
29 Cloud-init supports searching different "Data Sources" for information
30 that it uses to configure a cloud instance.

Subscribers

People subscribed via source and target branches