Accepting request 295648 from home:tbechtold:branches:Cloud:Tools

New upstream release

OBS-URL: https://build.opensuse.org/request/show/295648
OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=33

addopenSUSEBase.patch

@@ -1,8 +1,8 @@
-Index: cloud-init-0.7.5/cloudinit/config/cc_resolv_conf.py
+Index: cloud-init-0.7.6/cloudinit/config/cc_resolv_conf.py
 ===================================================================
---- cloud-init-0.7.5.orig/cloudinit/config/cc_resolv_conf.py
+--- cloud-init-0.7.6.orig/cloudinit/config/cc_resolv_conf.py
-+++ cloud-init-0.7.5/cloudinit/config/cc_resolv_conf.py
++++ cloud-init-0.7.6/cloudinit/config/cc_resolv_conf.py
-@@ -55,7 +55,7 @@ from cloudinit import util
+@@ -58,7 +58,7 @@ LOG = logging.getLogger(__name__)
  
  frequency = PER_INSTANCE
  
@@ -10,11 +10,11 @@ Index: cloud-init-0.7.5/cloudinit/config/cc_resolv_conf.py
 +distros = ['fedora', 'opensuse', 'rhel', 'sles']
  
  
- def generate_resolv_conf(cloud, log, params):
+ def generate_resolv_conf(template_fn, params, target_fname="/etc/resolv.conf"):
-Index: cloud-init-0.7.5/cloudinit/distros/__init__.py
+Index: cloud-init-0.7.6/cloudinit/distros/__init__.py
 ===================================================================
---- cloud-init-0.7.5.orig/cloudinit/distros/__init__.py
+--- cloud-init-0.7.6.orig/cloudinit/distros/__init__.py
-+++ cloud-init-0.7.5/cloudinit/distros/__init__.py
++++ cloud-init-0.7.6/cloudinit/distros/__init__.py
 @@ -41,7 +41,7 @@ OSFAMILIES = {
      'redhat': ['fedora', 'rhel'],
      'gentoo': ['gentoo'],

cloud-init-0.7.5.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a92bb83809c139a7db378916414c18b0819e306852d6c60dd89388868857ed33
-size 503717

cloud-init-0.7.6.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9e8fd22eb7f6e40ae6a5f66173ddc3cc18f65ee406c460a728092b37db2f3ed7
+size 515670

cloud-init.changes

@@ -1,3 +1,54 @@
+-------------------------------------------------------------------
+Mon Apr 13 08:46:40 UTC 2015 - tbechtold@suse.com
+
+- update to 0.7.6:
+  - open 0.7.6
+  - Enable vendordata on CloudSigma datasource (LP: #1303986)
+  - Poll on /dev/ttyS1 in CloudSigma datasource only if dmidecode says
+    we're running on cloudsigma (LP: #1316475) [Kiril Vladimiroff]
+  - SmartOS test: do not require existance of /dev/ttyS1. [LP: #1316597]
+  - doc: fix user-groups doc to reference plural ssh-authorized-keys
+    (LP: #1327065) [Joern Heissler]
+  - fix 'make test' in python 2.6
+  - support jinja2 as a templating engine.  Drop the hard requirement on
+    cheetah.  This helps in python3 effort. (LP: #1219223)
+  - change install path for systemd files to /lib/systemd/system
+    [Dimitri John Ledkov]
+  - change trunk debian packaging to use pybuild and drop cdbs.
+    [Dimitri John Ledkov]
+  - SeLinuxGuard: remove invalid check that looked for stat.st_mode in os.lstat.
+  - do not write comments in /etc/timezone (LP: #1341710)
+  - ubuntu: provide 'ubuntu-init-switch' module to aid in systemd testing.
+  - status/result json: remove 'end' entry which was always null
+  - systemd: make cloud-init block ssh service startup to guarantee keys
+    are generated. [Jordan Evans] (LP: #1333920)
+  - default settings: fix typo resulting in OpenStack and GCE not working
+    unless config explicitly provided (LP: #1329583) [Garrett Holmstrom])
+  - fix rendering resolv.conf if no 'options' are provided (LP: #1328953)
+  - docs: fix disk-setup to reference 'table_type' [Rail Aliiev] (LP: #1313114)
+  - ssh_authkey_fingerprints: fix bug that prevented disabling the module.
+    (LP: #1340903) [Patrick Lucas]
+  - no longer use pylint as a checker, fix pep8 [Jay Faulkner].
+  - Openstack: do not load some urls twice.
+  - FreeBsd: fix initscripts and add working config file [Harm Weites]
+  - Datasource: fix broken logic to provide hostname if datasource does not
+    provide one
+  - Improved and less verbose logging.
+  - resizefs: first check that device is writable.
+  - configdrive: fix reading of vendor data to be like metadata service reader.
+    [Jay Faulkner]
+  - resizefs: fix broken background resizing [Jay Faulkner] (LP: #1338614)
+  - cc_grub_dpkg: fix EC2 hvm instances to avoid prompt on grub update.
+    (LP: #1336855)
+  - FreeBsd: support config drive datasource [Joseph bajin]
+  - cc_mounts: support creating a swap file
+- Refresh addopenSUSEBase.patch
+- Refresh setupSUSEsysVInit.diff
+- Removed cloudinit-datasources.patch. Applied upstream
+- BuildRequires pkg-config. Needed to find correct systemd unit dir.
+- Add fix-default-systemd-unit-dir.patch . Use better default for
+  systemd system unit dir.
+
 -------------------------------------------------------------------
 Tue Feb 24 15:52:13 UTC 2015 - rjschwei@suse.com
 

cloud-init.spec

@@ -16,7 +16,7 @@
 #
 
 Name:           cloud-init
-Version:        0.7.5
+Version:        0.7.6
 Release:        0
 License:        GPL-3.0
 Summary:        Cloud node initialization tool
@@ -37,14 +37,16 @@ Patch5:         openSUSEhostsTemplate.diff
 Patch6:         dynamicInitCmd.diff
 # FIXME suseSetInitCmd.patch send upstream once the SUSE handlers are accepted
 Patch7:         suseSetInitCmd.patch
-Patch8:         cloudinit-datasources.patch
 Patch9:         cloud-init-no-dmidecode-on-ppc64.patch
 Patch10:        cloud-init-no-user-lock-if-already-locked.patch
 Patch11:        dataSourceOpenNebula.patch
+Patch12:        fix-default-systemd-unit-dir.patch
 BuildRequires:  fdupes
 BuildRequires:  filesystem
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
+# pkg-config is needed to find correct systemd unit dir
+BuildRequires:  pkg-config
 Requires:       bash
 Requires:       file
 Requires:       growpart
@@ -131,17 +133,15 @@ Unit tests for the cloud-init tools
 %patch5
 %patch6
 %patch7
-%patch8 -p1
 %patch9 -p1
 %patch10 -p1
 %patch11 -p2
+%patch12
 
 %if 0%{?suse_version} <= 1130
 # disable ecdsa for SLE 11 (not available)
 echo "ssh_genkeytypes: ['rsa', 'dsa']" >> %{SOURCE1}
 %endif
-# Install service files into correct location
-sed -i "s|/etc/systemd/system|%{systemd_prefix}/systemd/system|" setup.py
 
 %build
 python setup.py build

cloudinit-datasources.patch

@@ -1,13 +0,0 @@
-Index: cloud-init-0.7.5/cloudinit/settings.py
-===================================================================
---- cloud-init-0.7.5.orig/cloudinit/settings.py
-+++ cloud-init-0.7.5/cloudinit/settings.py
-@@ -37,7 +37,7 @@ CFG_BUILTIN = {
-         'OVF',
-         'MAAS',
-         'GCE',
--        'OpenStack'
-+        'OpenStack',
-         'Ec2',
-         'CloudSigma',
-         'CloudStack',

fix-default-systemd-unit-dir.patch

@@ -0,0 +1,13 @@
+=== modified file 'setup.py'
+--- setup.py	2015-01-21 20:28:32 +0000
++++ setup.py	2015-04-13 09:20:40 +0000
+@@ -60,7 +60,7 @@
+     try:
+         (path, err) = tiny_p(cmd)
+     except:
+-        return '/lib/systemd/system'
++        return '/usr/lib/systemd/system'
+     return str(path).strip()
+ 
+ INITSYS_FILES = {
+

setupSUSEsysVInit.diff

@@ -1,18 +1,20 @@
-diff -uNr cloud-init-0.7.4.orig/setup.py cloud-init-0.7.4/setup.py
+Index: cloud-init-0.7.6/setup.py
---- cloud-init-0.7.4.orig/setup.py	2014-01-04 12:26:55.704357892 -0500
+===================================================================
-+++ cloud-init-0.7.4/setup.py	2014-01-04 12:31:24.023166380 -0500
+--- cloud-init-0.7.6.orig/setup.py
-@@ -39,12 +39,14 @@
++++ cloud-init-0.7.6/setup.py
- INITSYS_FILES = {
+@@ -65,6 +65,7 @@ INITSYS_FILES = {
      'sysvinit': [f for f in glob('sysvinit/redhat/*') if is_f(f)],
+     'sysvinit_freebsd': [f for f in glob('sysvinit/freebsd/*') if is_f(f)],
      'sysvinit_deb': [f for f in glob('sysvinit/debian/*') if is_f(f)],
 +    'sysvinit_suse': [f for f in glob('sysvinit/suse/*') if is_f(f)],
      'systemd': [f for f in glob('systemd/*') if is_f(f)],
      'upstart': [f for f in glob('upstart/*') if is_f(f)],
  }
- INITSYS_ROOTS = {
+@@ -72,6 +73,7 @@ INITSYS_ROOTS = {
      'sysvinit': '/etc/rc.d/init.d',
+     'sysvinit_freebsd': '/usr/local/etc/rc.d',
      'sysvinit_deb': '/etc/init.d',
 +    'sysvinit_suse': '/etc/init.d',
-     'systemd': '/etc/systemd/system/',
+     'systemd': systemd_unitdir(),
      'upstart': '/etc/init/',
  }