diff --git a/cloud-init.changes b/cloud-init.changes index 6aee8a0..4bc05a1 100644 --- a/cloud-init.changes +++ b/cloud-init.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Dec 13 12:42:18 CET 2016 - kukuk@suse.de + +- fix syntax error in datasource LocalDisk (fix got somehow lost) + +------------------------------------------------------------------- +Mon Dec 12 12:47:09 UTC 2016 - dmueller@suse.com + +- adjust license (as of 0.7.8 AGPL-3.0 was added) + +------------------------------------------------------------------- +Mon Dec 12 11:25:03 UTC 2016 - dmueller@suse.com + +- fix unintentional edit in last change again + ------------------------------------------------------------------- Fri Dec 9 09:50:50 UTC 2016 - jgleissner@suse.com diff --git a/cloud-init.spec b/cloud-init.spec index 927a808..b5c41f4 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -14,11 +14,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# change this whenever config changes incompatible +%global configver 0.7 Name: cloud-init Version: 0.7.8 Release: 0 -License: GPL-3.0 +License: GPL-3.0 and AGPL-3.0 Summary: Cloud node initialization tool Url: http://launchpad.net/cloud-init/ Group: System/Management @@ -97,7 +99,7 @@ Requires: python-six Requires: python-xml Requires: sudo Requires: util-linux -Requires: cloud-init-config = %{version} +Requires: cloud-init-config = %configver BuildRoot: %{_tmppath}/%{name}-%{version}-build %define docdir %{_defaultdocdir}/%{name} %if 0%{?suse_version} && 0%{?suse_version} <= 1110 @@ -140,8 +142,7 @@ according to the fetched configuration data from the admin node. %package config-suse Summary: Configuration file for Cloud node initialization tool -Requires: cloud-init = %{version} -Provides: cloud-init-config = %{version} +Provides: cloud-init-config = %configver Group: System/Management Conflicts: otherproviders(cloud-init-config) diff --git a/datasourceLocalDisk.patch b/datasourceLocalDisk.patch index e4865f0..815f15f 100644 --- a/datasourceLocalDisk.patch +++ b/datasourceLocalDisk.patch @@ -41,7 +41,7 @@ + return "%s [seed=%s][dsmode=%s]" % (root, self.seed, self.dsmode) + + def get_data(self): -+ if not os.path.isdir('/cloud-init-config') ++ if not os.path.isdir('/cloud-init-config'): + return False + + defaults = {"instance-id": DEFAULT_IID}