Enable the DigitalOcean metadata provider by default

https://git.launchpad.net/cloud-init/commit/?id=7ae2011
https://bugzilla.redhat.com/show_bug.cgi?id=1388568
This commit is contained in:
Garrett Holmstrom 2016-10-25 09:59:06 -07:00
parent b48cb59de2
commit 01c4b43009
2 changed files with 21 additions and 1 deletions

View File

@ -0,0 +1,12 @@
Index: cloud-init-0.7.8/cloudinit/settings.py
===================================================================
--- cloud-init-0.7.8.orig/cloudinit/settings.py
+++ cloud-init-0.7.8/cloudinit/settings.py
@@ -32,6 +32,7 @@ CFG_BUILTIN = {
'NoCloud',
'ConfigDrive',
'OpenNebula',
+ 'DigitalOcean',
'Azure',
'AltCloud',
'OVF',

View File

@ -1,6 +1,6 @@
Name: cloud-init
Version: 0.7.8
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Cloud instance init scripts
Group: System Environment/Base
@ -49,6 +49,11 @@ Patch10: cloud-init-0.7.8-digitalocean-net.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1385172
Patch11: cloud-init-0.7.8-nm-controlled.patch
# Enable the DigitalOcean metadata provider by default
# https://git.launchpad.net/cloud-init/commit/?id=7ae2011
# https://bugzilla.redhat.com/show_bug.cgi?id=1388568
Patch12: cloud-init-0.7.8-enable-digitalocean.patch
BuildArch: noarch
BuildRequires: pkgconfig
@ -189,6 +194,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Tue Oct 25 2016 Garrett Holmstrom <gholms@fedoraproject.org> - 0.7.8-3
- Enabled the DigitalOcean metadata provider by default [RH:1388568]
* Fri Oct 14 2016 Garrett Holmstrom <gholms@fedoraproject.org> - 0.7.8-2
- Stopped writing NM_CONTROLLED=no to interface config files [RH:1385172]