commit caasp-tools for openSUSE:Factory

2019-02-27 Thread root
Hello community,

here is the log from the commit of package caasp-tools for openSUSE:Factory 
checked in at 2019-02-27 21:12:01

Comparing /work/SRC/openSUSE:Factory/caasp-tools (Old)
 and  /work/SRC/openSUSE:Factory/.caasp-tools.new.28833 (New)


Package is "caasp-tools"

Wed Feb 27 21:12:01 2019 rev:23 rq:679493 version:1.0+git20190218.9e72dd7

Changes:

--- /work/SRC/openSUSE:Factory/caasp-tools/caasp-tools.changes  2018-12-13 
19:49:09.132646034 +0100
+++ /work/SRC/openSUSE:Factory/.caasp-tools.new.28833/caasp-tools.changes   
2019-02-27 21:12:03.191192405 +0100
@@ -1,0 +2,8 @@
+Mon Feb 18 11:43:18 UTC 2019 - ku...@suse.de
+
+- Update to version 1.0+git20190218.9e72dd7:
+  * Move SUSE CaaS Platform specific code to CaaSP directory
+  * Move core files to /var/tmp, /tmp could be tmpfs
+  * Add service to print environment for debugging
+
+---

Old:

  microos-tools-1.0+git20181212.c28b214.tar.xz

New:

  microos-tools-1.0+git20190218.9e72dd7.tar.xz



Other differences:
--
++ caasp-tools.spec ++
--- /var/tmp/diff_new_pack.abdABA/_old  2019-02-27 21:12:03.727192297 +0100
+++ /var/tmp/diff_new_pack.abdABA/_new  2019-02-27 21:12:03.731192296 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package caasp-tools
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:   caasp-tools
-Version:1.0+git20181212.c28b214
+Version:1.0+git20190218.9e72dd7
 Release:0
 Summary:Files and Scripts for SUSE CaaS Platform
 License:GPL-2.0-or-later
@@ -52,6 +52,7 @@
 pod2man %{SOURCE1} > %{buildroot}%{_mandir}/man8/create_autoyast_profile.8
 mkdir -p %{buildroot}%{_docdir}/%{name}
 install -D -m644 caasp/cloud-init/cc_suse_caasp.py 
%{buildroot}%{python3_sitelib}/cloudinit/config/cc_suse_caasp.py
+cp -a caasp/{etc,usr} %{buildroot}
 
 %pre
 %service_add_pre adjust-cloud-cfg.service setup-salt-minion.service
@@ -86,7 +87,6 @@
 %files
 %license COPYING
 %config %{_sysconfdir}/systemd/system/systemd-firstboot.service
-%config %{_sysconfdir}/salt/minion.d/grains_refresh.conf
 %{_unitdir}
 %{_prefix}/lib/sysctl.d/51-corefiles.conf
 %{_libexecdir}/MicroOS-firstboot
@@ -98,5 +98,6 @@
 %{_sbindir}/setup-systemd-proxy-env
 %{_mandir}/man8/btrfsQuota.8*
 %{_mandir}/man8/create_autoyast_profile.8*
+%config %{_sysconfdir}/salt/minion.d/grains_refresh.conf
 
 %changelog

++ _servicedata ++
--- /var/tmp/diff_new_pack.abdABA/_old  2019-02-27 21:12:03.771192288 +0100
+++ /var/tmp/diff_new_pack.abdABA/_new  2019-02-27 21:12:03.771192288 +0100
@@ -1,6 +1,6 @@
 
   
 git://github.com/kubic-project/microos-tools.git
-c28b2148abaaf0db588a0bf273d87bc1dd916374
+9e72dd715157ffd9019b4d80e973218144accca8
  
 
\ No newline at end of file

++ microos-tools-1.0+git20181212.c28b214.tar.xz -> 
microos-tools-1.0+git20190218.9e72dd7.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/microos-tools-1.0+git20181212.c28b214/caasp/etc/salt/minion.d/grains_refresh.conf
 
new/microos-tools-1.0+git20190218.9e72dd7/caasp/etc/salt/minion.d/grains_refresh.conf
--- 
old/microos-tools-1.0+git20181212.c28b214/caasp/etc/salt/minion.d/grains_refresh.conf
   1970-01-01 01:00:00.0 +0100
+++ 
new/microos-tools-1.0+git20190218.9e72dd7/caasp/etc/salt/minion.d/grains_refresh.conf
   2019-02-18 12:42:23.0 +0100
@@ -0,0 +1 @@
+grains_refresh_every: 10
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/microos-tools-1.0+git20181212.c28b214/caasp/usr/lib/systemd/system/adjust-cloud-cfg.service
 
new/microos-tools-1.0+git20190218.9e72dd7/caasp/usr/lib/systemd/system/adjust-cloud-cfg.service
--- 
old/microos-tools-1.0+git20181212.c28b214/caasp/usr/lib/systemd/system/adjust-cloud-cfg.service
 1970-01-01 01:00:00.0 +0100
+++ 
new/microos-tools-1.0+git20190218.9e72dd7/caasp/usr/lib/systemd/system/adjust-cloud-cfg.service
 2019-02-18 12:42:23.0 +0100
@@ -0,0 +1,16 @@
+[Unit]
+Description=Adjust cloud.cfg for network configuration
+DefaultDependencies=no
+Wants=local-fs.target
+After=local-fs.target
+Before=cloud-init-local.service
+ConditionPathExists=/etc/cloud/cloud.cfg.d
+ConditionPathExists=!/etc/cloud/cloud.cfg.d/01-network.cfg
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/sbin/adjust-cloud-cfg
+
+[Install]
+WantedBy=multi-user.target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' 

commit caasp-tools for openSUSE:Factory

2018-12-13 Thread root
Hello community,

here is the log from the commit of package caasp-tools for openSUSE:Factory 
checked in at 2018-12-13 19:49:06

Comparing /work/SRC/openSUSE:Factory/caasp-tools (Old)
 and  /work/SRC/openSUSE:Factory/.caasp-tools.new.28833 (New)


Package is "caasp-tools"

Thu Dec 13 19:49:06 2018 rev:22 rq:657568 version:1.0+git20181212.c28b214

Changes:

--- /work/SRC/openSUSE:Factory/caasp-tools/caasp-tools.changes  2018-12-08 
11:22:04.930741107 +0100
+++ /work/SRC/openSUSE:Factory/.caasp-tools.new.28833/caasp-tools.changes   
2018-12-13 19:49:09.132646034 +0100
@@ -1,0 +2,14 @@
+Wed Dec 12 14:03:26 UTC 2018 - ku...@suse.de
+
+- Update to version 1.0+git20181212.c28b214:
+  * Store manual page uncompressed
+
+---
+Wed Dec 12 13:53:54 UTC 2018 - ku...@suse.de
+
+- Update to version 1.0+git20181212.a821c06:
+  * Add manual page for btrfsQuota
+  * Fix permissions of btrfsQuota
+  * Add btrfsQuota command (from btrfs wiki)
+
+---

Old:

  microos-tools-1.0+git20181207.2d715d2.tar.xz

New:

  microos-tools-1.0+git20181212.c28b214.tar.xz



Other differences:
--
++ caasp-tools.spec ++
--- /var/tmp/diff_new_pack.gg8IIw/_old  2018-12-13 19:49:09.580645456 +0100
+++ /var/tmp/diff_new_pack.gg8IIw/_new  2018-12-13 19:49:09.584645450 +0100
@@ -17,7 +17,7 @@
 
 
 Name:   caasp-tools
-Version:1.0+git20181207.2d715d2
+Version:1.0+git20181212.c28b214
 Release:0
 Summary:Files and Scripts for SUSE CaaS Platform
 License:GPL-2.0-or-later
@@ -92,9 +92,11 @@
 %{_libexecdir}/MicroOS-firstboot
 %{_libexecdir}/python*
 %{_sbindir}/adjust-cloud-cfg
+%{_sbindir}/btrfsQuota
 %{_sbindir}/create_autoyast_profile
 %{_sbindir}/migrate-ntp2chrony
 %{_sbindir}/setup-systemd-proxy-env
+%{_mandir}/man8/btrfsQuota.8*
 %{_mandir}/man8/create_autoyast_profile.8*
 
 %changelog

++ _servicedata ++
--- /var/tmp/diff_new_pack.gg8IIw/_old  2018-12-13 19:49:09.624645399 +0100
+++ /var/tmp/diff_new_pack.gg8IIw/_new  2018-12-13 19:49:09.624645399 +0100
@@ -1,6 +1,6 @@
 
   
 git://github.com/kubic-project/microos-tools.git
-2d715d28ec68863825c4bcea028be87302ccfe63
+c28b2148abaaf0db588a0bf273d87bc1dd916374
  
 
\ No newline at end of file

++ microos-tools-1.0+git20181207.2d715d2.tar.xz -> 
microos-tools-1.0+git20181212.c28b214.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/microos-tools-1.0+git20181207.2d715d2/usr/sbin/btrfsQuota 
new/microos-tools-1.0+git20181212.c28b214/usr/sbin/btrfsQuota
--- old/microos-tools-1.0+git20181207.2d715d2/usr/sbin/btrfsQuota   
1970-01-01 01:00:00.0 +0100
+++ new/microos-tools-1.0+git20181212.c28b214/usr/sbin/btrfsQuota   
2018-12-12 15:02:49.0 +0100
@@ -0,0 +1,61 @@
+#!/usr/bin/python3
+
+# From:
+# 
https://btrfs.wiki.kernel.org/index.php/Quota_support#.2Fusr.2Flocal.2Fbin.2FbtrfsQuota.py
+
+import argparse
+import subprocess
+
+parser = argparse.ArgumentParser(
+description='Gives quotas from a BTRFS filesystem in a readable form'
+)
+parser.add_argument(
+'--unit', metavar='U', type=str,
+default='G',
+help='SI Unit, [B]ytes, K, M, G, T, P',
+)
+parser.add_argument(
+'mount_point', metavar='PATH', type=str,
+default='/',
+help='BTRFS mount point',
+)
+sys_args = parser.parse_args()
+mount_point = sys_args.mount_point
+
+multiplicator_lookup = ['B', 'K', 'M', 'G', 'T', 'P']
+
+subvolume_data = dict()
+cmd = ["btrfs",  "subvolume", "list", mount_point]
+for line in subprocess.check_output(cmd).splitlines():
+args = str(line, encoding='utf8').split()
+subvolume_data[int(args[1])] = args[-1]
+
+print("subvol\t\t\t\t\t\tgroup totalunshared")
+print("-" * 79)
+cmd = ["btrfs", "qgroup", "show", "--raw", mount_point]
+for line in subprocess.check_output(cmd).splitlines():
+args = str(line, encoding='utf8').split()
+
+try:
+subvolume_id = args[0].split('/')[-1]
+subvolume_name = subvolume_data[int(subvolume_id)]
+except:
+subvolume_name = "(unknown)"
+
+multiplicator = 1024 ** multiplicator_lookup.index(sys_args.unit)
+
+try:
+try:
+total = "%02.2f" % (float(args[1]) / multiplicator)
+unshared = "%02.2f" % (float(args[2]) / multiplicator)
+except ValueError:
+continue
+print("%s\t%s\t%s%s %s%s" % (
+subvolume_name.ljust(40),
+args[0],
+total.rjust(10), sys_args.unit,
+unshared.rjust(10), sys_args.unit,
+))
+except IndexError:
+pass
+
diff -urN '--exclude=CVS' 

commit caasp-tools for openSUSE:Factory

2018-12-08 Thread root
Hello community,

here is the log from the commit of package caasp-tools for openSUSE:Factory 
checked in at 2018-12-08 11:22:04

Comparing /work/SRC/openSUSE:Factory/caasp-tools (Old)
 and  /work/SRC/openSUSE:Factory/.caasp-tools.new.19453 (New)


Package is "caasp-tools"

Sat Dec  8 11:22:04 2018 rev:21 rq:656083 version:1.0+git20181207.2d715d2

Changes:

--- /work/SRC/openSUSE:Factory/caasp-tools/caasp-tools.changes  2018-09-28 
08:53:10.717748329 +0200
+++ /work/SRC/openSUSE:Factory/.caasp-tools.new.19453/caasp-tools.changes   
2018-12-08 11:22:04.930741107 +0100
@@ -1,0 +2,10 @@
+Fri Dec 07 13:33:51 UTC 2018 - ku...@suse.de
+
+- Update to version 1.0+git20181207.2d715d2:
+  * Don't configure systemd-timesyncd anymore on the cluster nodes, admin has 
to use the ntp module, which can meanwhile configure everything.
+  * Fix formating of bash script
+  * Add service, which watches /etc/sysconfig/proxy and sets the environment 
variables for systemd services
+  * Fix product name
+  * Move cloud-init module for caasp into caasp special sub directory
+
+---

Old:

  microos-tools-1.0+git20180926.e9f5cfe.tar.xz

New:

  microos-tools-1.0+git20181207.2d715d2.tar.xz



Other differences:
--
++ caasp-tools.spec ++
--- /var/tmp/diff_new_pack.CpFlkQ/_old  2018-12-08 11:22:05.538740526 +0100
+++ /var/tmp/diff_new_pack.CpFlkQ/_new  2018-12-08 11:22:05.542740522 +0100
@@ -17,7 +17,7 @@
 
 
 Name:   caasp-tools
-Version:1.0+git20180926.e9f5cfe
+Version:1.0+git20181207.2d715d2
 Release:0
 Summary:Files and Scripts for SUSE CaaS Platform
 License:GPL-2.0-or-later
@@ -51,7 +51,7 @@
 mkdir -p %{buildroot}%{_mandir}/man8
 pod2man %{SOURCE1} > %{buildroot}%{_mandir}/man8/create_autoyast_profile.8
 mkdir -p %{buildroot}%{_docdir}/%{name}
-install -D -m644 cloud-init/cc_suse_caasp.py 
%{buildroot}%{python3_sitelib}/cloudinit/config/cc_suse_caasp.py
+install -D -m644 caasp/cloud-init/cc_suse_caasp.py 
%{buildroot}%{python3_sitelib}/cloudinit/config/cc_suse_caasp.py
 
 %pre
 %service_add_pre adjust-cloud-cfg.service setup-salt-minion.service
@@ -94,6 +94,7 @@
 %{_sbindir}/adjust-cloud-cfg
 %{_sbindir}/create_autoyast_profile
 %{_sbindir}/migrate-ntp2chrony
+%{_sbindir}/setup-systemd-proxy-env
 %{_mandir}/man8/create_autoyast_profile.8*
 
 %changelog

++ _servicedata ++
--- /var/tmp/diff_new_pack.CpFlkQ/_old  2018-12-08 11:22:05.570740495 +0100
+++ /var/tmp/diff_new_pack.CpFlkQ/_new  2018-12-08 11:22:05.570740495 +0100
@@ -1,6 +1,6 @@
 
   
 git://github.com/kubic-project/microos-tools.git
-e9f5cfe44699ae487d5067ae167478f5299d4432
+2d715d28ec68863825c4bcea028be87302ccfe63
  
 
\ No newline at end of file

++ microos-tools-1.0+git20180926.e9f5cfe.tar.xz -> 
microos-tools-1.0+git20181207.2d715d2.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/microos-tools-1.0+git20180926.e9f5cfe/caasp/cloud-init/cc_suse_caasp.py 
new/microos-tools-1.0+git20181207.2d715d2/caasp/cloud-init/cc_suse_caasp.py
--- old/microos-tools-1.0+git20180926.e9f5cfe/caasp/cloud-init/cc_suse_caasp.py 
1970-01-01 01:00:00.0 +0100
+++ new/microos-tools-1.0+git20181207.2d715d2/caasp/cloud-init/cc_suse_caasp.py 
2018-12-07 14:26:43.0 +0100
@@ -0,0 +1,71 @@
+# vi: ts=4 expandtab
+#
+#Copyright (C) 2017,2018 SUSE LLC
+#
+#Author: Thorsten Kukuk 
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License
+#in Version 2 or later as published by the Free Software Foundation.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU General Public License
+#along with this program.  If not, see .
+
+from cloudinit.settings import PER_INSTANCE
+from cloudinit import util
+
+frequency = PER_INSTANCE
+
+DEFAULT_PERMS = 0o644
+
+# suse_caasp:
+#  role: [admin|cluster]
+#  admin_node: admin-node.example.com
+
+def enable_service(service):
+cmd = ['systemctl', 'enable', '--now', service]
+util.subp(cmd, capture=True)
+
+def handle(name, cfg, cloud, log, args):
+if len(args) != 0:
+caasp_cfg = util.read_conf(args[0])
+else:
+if 'suse_caasp' not in cfg:
+log.debug(("Skipping module named %s, "
+   "no 'suse_caasp' configuration found"), name)
+return
+

commit caasp-tools for openSUSE:Factory

2018-09-28 Thread root
Hello community,

here is the log from the commit of package caasp-tools for openSUSE:Factory 
checked in at 2018-09-28 08:53:07

Comparing /work/SRC/openSUSE:Factory/caasp-tools (Old)
 and  /work/SRC/openSUSE:Factory/.caasp-tools.new (New)


Package is "caasp-tools"

Fri Sep 28 08:53:07 2018 rev:20 rq:638387 version:1.0+git20180926.e9f5cfe

Changes:

--- /work/SRC/openSUSE:Factory/caasp-tools/caasp-tools.changes  2018-08-22 
14:20:56.418435131 +0200
+++ /work/SRC/openSUSE:Factory/.caasp-tools.new/caasp-tools.changes 
2018-09-28 08:53:10.717748329 +0200
@@ -2 +2,9 @@
-Tue Aug 21 12:15:29 UTC 2018 - opensuse-packag...@opensuse.org
+Wed Sep 26 11:47:42 UTC 2018 - ku...@suse.de
+
+- Update to version 1.0+git20180926.e9f5cfe:
+  * Overwrite systemd-coredump for core files, as systemd is not
+available in containers.
+- Add conflict with systemd-coredump
+
+---
+Tue Aug 21 12:15:29 UTC 2018 - ku...@suse.de

Old:

  microos-tools-1.0+git20180821.b2af3a9.tar.xz

New:

  microos-tools-1.0+git20180926.e9f5cfe.tar.xz



Other differences:
--
++ caasp-tools.spec ++
--- /var/tmp/diff_new_pack.LUBbRV/_old  2018-09-28 08:53:11.293747496 +0200
+++ /var/tmp/diff_new_pack.LUBbRV/_new  2018-09-28 08:53:11.293747496 +0200
@@ -12,12 +12,12 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:   caasp-tools
-Version:1.0+git20180821.b2af3a9
+Version:1.0+git20180926.e9f5cfe
 Release:0
 Summary:Files and Scripts for SUSE CaaS Platform
 License:GPL-2.0-or-later
@@ -31,6 +31,7 @@
 Requires:   ntp2chrony
 Requires:   perl-JSON
 Requires:   read-only-root-fs
+Conflicts:  systemd-coredump
 BuildArch:  noarch
 
 %description
@@ -87,6 +88,7 @@
 %config %{_sysconfdir}/systemd/system/systemd-firstboot.service
 %config %{_sysconfdir}/salt/minion.d/grains_refresh.conf
 %{_unitdir}
+%{_prefix}/lib/sysctl.d/51-corefiles.conf
 %{_libexecdir}/MicroOS-firstboot
 %{_libexecdir}/python*
 %{_sbindir}/adjust-cloud-cfg

++ _service ++
--- /var/tmp/diff_new_pack.LUBbRV/_old  2018-09-28 08:53:11.317747461 +0200
+++ /var/tmp/diff_new_pack.LUBbRV/_new  2018-09-28 08:53:11.317747461 +0200
@@ -5,6 +5,7 @@
 git://github.com/kubic-project/microos-tools.git
 git
 enable
+ku...@suse.de
   
   
 xz

++ _servicedata ++
--- /var/tmp/diff_new_pack.LUBbRV/_old  2018-09-28 08:53:11.333747438 +0200
+++ /var/tmp/diff_new_pack.LUBbRV/_new  2018-09-28 08:53:11.333747438 +0200
@@ -1,6 +1,6 @@
 
   
 git://github.com/kubic-project/microos-tools.git
-b2af3a970986fd17e2b8f0f53bf4eda27edffbcb
+e9f5cfe44699ae487d5067ae167478f5299d4432
  
 
\ No newline at end of file

++ microos-tools-1.0+git20180821.b2af3a9.tar.xz -> 
microos-tools-1.0+git20180926.e9f5cfe.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/microos-tools-1.0+git20180821.b2af3a9/usr/lib/sysctl.d/51-corefiles.conf 
new/microos-tools-1.0+git20180926.e9f5cfe/usr/lib/sysctl.d/51-corefiles.conf
--- 
old/microos-tools-1.0+git20180821.b2af3a9/usr/lib/sysctl.d/51-corefiles.conf
1970-01-01 01:00:00.0 +0100
+++ 
new/microos-tools-1.0+git20180926.e9f5cfe/usr/lib/sysctl.d/51-corefiles.conf
2018-09-26 13:46:33.0 +0200
@@ -0,0 +1,10 @@
+# Create core files in /tmp with an unique name
+# %p: pid
+# %%: output one '%'
+# %u: uid
+# %g: gid
+# %s: signal number
+# %t: UNIX time of dump
+# %h: hostname
+# %e: executable filename
+kernel.core_pattern=/tmp/core.%h.%e.%p.%t




commit caasp-tools for openSUSE:Factory

2018-08-22 Thread root
Hello community,

here is the log from the commit of package caasp-tools for openSUSE:Factory 
checked in at 2018-08-22 14:20:56

Comparing /work/SRC/openSUSE:Factory/caasp-tools (Old)
 and  /work/SRC/openSUSE:Factory/.caasp-tools.new (New)


Package is "caasp-tools"

Wed Aug 22 14:20:56 2018 rev:19 rq:630772 version:1.0+git20180821.b2af3a9

Changes:

--- /work/SRC/openSUSE:Factory/caasp-tools/caasp-tools.changes  2018-06-19 
12:04:19.920542759 +0200
+++ /work/SRC/openSUSE:Factory/.caasp-tools.new/caasp-tools.changes 
2018-08-22 14:20:56.418435131 +0200
@@ -1,0 +2,7 @@
+Tue Aug 21 12:15:29 UTC 2018 - opensuse-packag...@opensuse.org
+
+- Update to version 1.0+git20180821.b2af3a9:
+  * Start timesyncd service first on cluster nodes.
+  * Remove start of container-feeder, does not exist anymore on SLE15
+
+---

Old:

  microos-tools-1.0+git20180615.b5e9b2d.tar.xz

New:

  microos-tools-1.0+git20180821.b2af3a9.tar.xz



Other differences:
--
++ caasp-tools.spec ++
--- /var/tmp/diff_new_pack.8NbJE6/_old  2018-08-22 14:20:56.890436250 +0200
+++ /var/tmp/diff_new_pack.8NbJE6/_new  2018-08-22 14:20:56.890436250 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   caasp-tools
-Version:1.0+git20180615.b5e9b2d
+Version:1.0+git20180821.b2af3a9
 Release:0
 Summary:Files and Scripts for SUSE CaaS Platform
 License:GPL-2.0-or-later

++ _servicedata ++
--- /var/tmp/diff_new_pack.8NbJE6/_old  2018-08-22 14:20:56.918436316 +0200
+++ /var/tmp/diff_new_pack.8NbJE6/_new  2018-08-22 14:20:56.918436316 +0200
@@ -1,6 +1,6 @@
 
   
 git://github.com/kubic-project/microos-tools.git
-b5e9b2def724d24fde0d559cc2c572890df62557
+b2af3a970986fd17e2b8f0f53bf4eda27edffbcb
  
 
\ No newline at end of file

++ microos-tools-1.0+git20180615.b5e9b2d.tar.xz -> 
microos-tools-1.0+git20180821.b2af3a9.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/microos-tools-1.0+git20180615.b5e9b2d/cloud-init/cc_suse_caasp.py 
new/microos-tools-1.0+git20180821.b2af3a9/cloud-init/cc_suse_caasp.py
--- old/microos-tools-1.0+git20180615.b5e9b2d/cloud-init/cc_suse_caasp.py   
2018-06-15 12:42:49.0 +0200
+++ new/microos-tools-1.0+git20180821.b2af3a9/cloud-init/cc_suse_caasp.py   
2018-08-21 14:13:50.0 +0200
@@ -1,6 +1,6 @@
 # vi: ts=4 expandtab
 #
-#Copyright (C) 2017 SUSE LLC
+#Copyright (C) 2017,2018 SUSE LLC
 #
 #Author: Thorsten Kukuk 
 #
@@ -52,7 +52,6 @@
 enable_service('admin-node-init')
 enable_service('admin-node-setup')
 enable_service('docker')
-enable_service('container-feeder')
 enable_service('etcd')
 enable_service('kubelet')
 enable_service('salt-minion')
@@ -70,9 +69,8 @@
 cmd = ['sed', '-i', '-e', sed_arg, '/etc/systemd/timesyncd.conf']
 util.subp(cmd, capture=True)
 
+enable_service('systemd-timesyncd')
 enable_service('docker')
-enable_service('container-feeder')
 enable_service('salt-minion')
-enable_service('systemd-timesyncd')
 else:
 log.warn(("Unknown role %s, skipping module named %s"), role, name)




commit caasp-tools for openSUSE:Factory

2018-06-19 Thread root
Hello community,

here is the log from the commit of package caasp-tools for openSUSE:Factory 
checked in at 2018-06-19 12:04:17

Comparing /work/SRC/openSUSE:Factory/caasp-tools (Old)
 and  /work/SRC/openSUSE:Factory/.caasp-tools.new (New)


Package is "caasp-tools"

Tue Jun 19 12:04:17 2018 rev:18 rq:617299 version:1.0+git20180615.b5e9b2d

Changes:

--- /work/SRC/openSUSE:Factory/caasp-tools/caasp-tools.changes  2018-03-06 
10:49:29.667501644 +0100
+++ /work/SRC/openSUSE:Factory/.caasp-tools.new/caasp-tools.changes 
2018-06-19 12:04:19.920542759 +0200
@@ -1,0 +2,43 @@
+Sun Jun 17 09:51:32 CEST 2018 - ku...@suse.de
+
+- Create /var/adm/netconfig in %posttrans if still needed after
+  upgrade
+
+---
+Fri Jun 15 12:43:37 CEST 2018 - ku...@suse.de
+
+- Update to version 1.0+git20180615.b5e9b2d:
+  * Move log file to /var/log, add timestamp
+
+---
+Fri Jun 15 12:37:21 CEST 2018 - ku...@suse.de
+
+- Fix name of migration script
+
+---
+Fri Jun 15 11:11:03 CEST 2018 - ku...@suse.de
+
+- Update to version 1.0+git20180615.6204c42:
+  * Save output in logfile
+- Fix /var/lock symlink for migration from CaaSP v3 to v4.
+
+---
+Wed Jun 13 14:37:56 UTC 2018 - ku...@suse.de
+
+- Update to version 1.0+git20180613.53ac895:
+  * Add migrate-ntp2chrony
+- Call migrate-ntp2chrony from posttrans section
+
+---
+Wed Jun 13 12:20:34 UTC 2018 - ku...@suse.de
+
+- Update to version 1.0+git20180613.b7f1fb1:
+  * Replace activate.sh call with admin-node-init.service
+
+---
+Wed Jun 13 11:47:00 UTC 2018 - ku...@suse.de
+
+- Update to version 1.0+git20180613.750:
+  * Add README.md
+
+---

Old:

  COPYING
  MicroOS-tools-0.28.tar.bz2
  cc_suse_caasp.py

New:

  _service
  _servicedata
  microos-tools-1.0+git20180615.b5e9b2d.tar.xz



Other differences:
--
++ caasp-tools.spec ++
--- /var/tmp/diff_new_pack.LfgnYG/_old  2018-06-19 12:04:20.500521226 +0200
+++ /var/tmp/diff_new_pack.LfgnYG/_new  2018-06-19 12:04:20.504521077 +0200
@@ -17,18 +17,18 @@
 
 
 Name:   caasp-tools
-Version:0.28
+Version:1.0+git20180615.b5e9b2d
 Release:0
 Summary:Files and Scripts for SUSE CaaS Platform
 License:GPL-2.0-or-later
 Group:  Development/Tools/Other
-Source0:MicroOS-tools-%{version}.tar.bz2
+Url:https://github.com/kubic-project/microos-tools
+Source0:microos-tools-%{version}.tar.xz
 Source1:create_autoyast_profile.pl
-Source2:COPYING
-Source3:cc_suse_caasp.py
 BuildRequires:  distribution-release
 BuildRequires:  python3-base
 BuildRequires:  salt-minion
+Requires:   ntp2chrony
 Requires:   perl-JSON
 Requires:   read-only-root-fs
 BuildArch:  noarch
@@ -38,27 +38,25 @@
 openSUSE Kubic.
 
 %prep
-%setup -q -n MicroOS-tools-%{version}
+%setup -q -n microos-tools-%{version}
 
 %build
 
 %install
-cp -a * %{buildroot}
+cp -a {etc,usr} %{buildroot}
 # Copy the COPYING file for files section
-cp -p %{SOURCE2} .
 mkdir -p %{buildroot}%{_sbindir}
 install %{SOURCE1} %{buildroot}%{_sbindir}/create_autoyast_profile
 mkdir -p %{buildroot}%{_mandir}/man8
 pod2man %{SOURCE1} > %{buildroot}%{_mandir}/man8/create_autoyast_profile.8
 mkdir -p %{buildroot}%{_docdir}/%{name}
-install -D -m644 %{SOURCE3} 
%{buildroot}%{python3_sitelib}/cloudinit/config/cc_suse_caasp.py
+install -D -m644 cloud-init/cc_suse_caasp.py 
%{buildroot}%{python3_sitelib}/cloudinit/config/cc_suse_caasp.py
 
 %pre
 %service_add_pre adjust-cloud-cfg.service setup-salt-minion.service
 
 %post
 %service_add_post adjust-cloud-cfg.service setup-salt-minion.service
-exit 0
 
 %preun
 %service_del_preun adjust-cloud-cfg.service setup-salt-minion.service
@@ -66,6 +64,24 @@
 %postun
 %service_del_postun adjust-cloud-cfg.service setup-salt-minion.service
 
+%posttrans
+# Switch from ntp to chrony
+/usr/sbin/migrate-ntp2chrony ||:
+# During migration from CaaSP v3 to v4 /var/lock was
+# removed from filesystem and systemd cannot create it.
+# Only do this if /var is normally not writeable.
+if [ ! -e /var/lock ]; then
+mount --fake /var 2>/dev/null || ln -sf /run/lock /var/lock
+fi
+# During migration from CaaSP v3 to v4 /var/adm/netconfig was
+# removed and netconfig cannot create it.
+# Only do this if /var is normally not writeable.
+if [ ! -e /var/adm/netconfig ]; then

commit caasp-tools for openSUSE:Factory

2018-03-06 Thread root
Hello community,

here is the log from the commit of package caasp-tools for openSUSE:Factory 
checked in at 2018-03-06 10:48:54

Comparing /work/SRC/openSUSE:Factory/caasp-tools (Old)
 and  /work/SRC/openSUSE:Factory/.caasp-tools.new (New)


Package is "caasp-tools"

Tue Mar  6 10:48:54 2018 rev:17 rq:583220 version:0.28

Changes:

--- /work/SRC/openSUSE:Factory/caasp-tools/caasp-tools.changes  2018-02-28 
20:02:34.588301154 +0100
+++ /work/SRC/openSUSE:Factory/.caasp-tools.new/caasp-tools.changes 
2018-03-06 10:49:29.667501644 +0100
@@ -1,0 +2,5 @@
+Mon Mar  5 16:14:05 UTC 2018 - rbr...@suse.com
+
+- Remove Kubic workaround, will now use caasp-container-manifests
+
+---



Other differences:
--
++ caasp-tools.spec ++
--- /var/tmp/diff_new_pack.zZvvnG/_old  2018-03-06 10:49:30.275479681 +0100
+++ /var/tmp/diff_new_pack.zZvvnG/_new  2018-03-06 10:49:30.279479537 +0100
@@ -52,11 +52,6 @@
 pod2man %{SOURCE1} > %{buildroot}%{_mandir}/man8/create_autoyast_profile.8
 mkdir -p %{buildroot}%{_docdir}/%{name}
 install -D -m644 %{SOURCE3} 
%{buildroot}%{python3_sitelib}/cloudinit/config/cc_suse_caasp.py
-%if ! 0%{?is_susecaasp}
-mkdir -p %{buildroot}%{_datadir}/caasp-container-manifests
-echo -e "#!/bin/bash\ntrue" > 
%{buildroot}%{_datadir}/caasp-container-manifests/activate.sh
-chmod 755 %{buildroot}%{_datadir}/caasp-container-manifests/activate.sh
-%endif
 
 %pre
 %service_add_pre adjust-cloud-cfg.service setup-salt-minion.service
@@ -81,9 +76,5 @@
 %{_sbindir}/adjust-cloud-cfg
 %{_sbindir}/create_autoyast_profile
 %{_mandir}/man8/create_autoyast_profile.8*
-%if ! 0%{?is_susecaasp}
-%dir %{_datadir}/caasp-container-manifests
-%{_datadir}/caasp-container-manifests/activate.sh
-%endif
 
 %changelog




commit caasp-tools for openSUSE:Factory

2018-02-28 Thread root
Hello community,

here is the log from the commit of package caasp-tools for openSUSE:Factory 
checked in at 2018-02-28 20:02:34

Comparing /work/SRC/openSUSE:Factory/caasp-tools (Old)
 and  /work/SRC/openSUSE:Factory/.caasp-tools.new (New)


Package is "caasp-tools"

Wed Feb 28 20:02:34 2018 rev:16 rq:580651 version:0.28

Changes:

--- /work/SRC/openSUSE:Factory/caasp-tools/caasp-tools.changes  2018-02-22 
15:01:09.988765754 +0100
+++ /work/SRC/openSUSE:Factory/.caasp-tools.new/caasp-tools.changes 
2018-02-28 20:02:34.588301154 +0100
@@ -1,0 +2,7 @@
+Tue Feb 27 16:44:23 CET 2018 - ku...@suse.de
+
+- Remove read-only root filesystem stuff, was moved to
+  read-only-root-fs
+- Require read-only-root-fs
+
+---

Old:

  MicroOS-tools-0.27.tar.bz2

New:

  MicroOS-tools-0.28.tar.bz2



Other differences:
--
++ caasp-tools.spec ++
--- /var/tmp/diff_new_pack.a5EwYz/_old  2018-02-28 20:02:35.436270473 +0100
+++ /var/tmp/diff_new_pack.a5EwYz/_new  2018-02-28 20:02:35.440270328 +0100
@@ -17,7 +17,7 @@
 
 
 Name:   caasp-tools
-Version:0.27
+Version:0.28
 Release:0
 Summary:Files and Scripts for SUSE CaaS Platform
 License:GPL-2.0-or-later
@@ -27,23 +27,15 @@
 Source2:COPYING
 Source3:cc_suse_caasp.py
 BuildRequires:  distribution-release
-%if 0%{?suse_version} < 1330
-BuildRequires:  python2-base
-%else
 BuildRequires:  python3-base
-%endif
 BuildRequires:  salt-minion
 Requires:   perl-JSON
-#only needed as directory owners
-# Requires:   distribution-release systemd udev
-Requires:   util-linux
-Requires(post): awk
-%{?systemd_requires}
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+Requires:   read-only-root-fs
 BuildArch:  noarch
 
 %description
-Files, scripts and directories for SUSE Containers as a Service Platform.
+Files, scripts and directories for SUSE CaaS Platform and
+openSUSE Kubic.
 
 %prep
 %setup -q -n MicroOS-tools-%{version}
@@ -52,27 +44,16 @@
 
 %install
 cp -a * %{buildroot}
+# Copy the COPYING file for files section
+cp -p %{SOURCE2} .
 mkdir -p %{buildroot}%{_sbindir}
 install %{SOURCE1} %{buildroot}%{_sbindir}/create_autoyast_profile
-mkdir -p %{buildroot}%{_localstatedir}/adm/netconfig
-mkdir -p %{buildroot}%{_localstatedir}/lib/overlay
-mkdir -p %{buildroot}%{_localstatedir}/lib/overlay/etc
-mkdir -p %{buildroot}%{_localstatedir}/lib/overlay/work-etc
-mkdir -p %{buildroot}%{_localstatedir}/lib/overlay/netconfig
-mkdir -p %{buildroot}%{_localstatedir}/lib/overlay/work-netconfig
-mkdir -p %{buildroot}%{_localstatedir}/lib/overlay/apparmor
-mkdir -p %{buildroot}%{_localstatedir}/lib/overlay/work-apparmor
 mkdir -p %{buildroot}%{_mandir}/man8
 pod2man %{SOURCE1} > %{buildroot}%{_mandir}/man8/create_autoyast_profile.8
 mkdir -p %{buildroot}%{_docdir}/%{name}
-install -D -m644 %{SOURCE2} %{buildroot}%{_docdir}/%{name}/COPYING
-%if 0%{?suse_version} < 1330
-install -D -m644 %{SOURCE3} 
%{buildroot}%{python_sitelib}/cloudinit/config/cc_suse_caasp.py
-%else
 install -D -m644 %{SOURCE3} 
%{buildroot}%{python3_sitelib}/cloudinit/config/cc_suse_caasp.py
-%endif
 %if ! 0%{?is_susecaasp}
-mkdir -p %{buildroot}/usr/share/caasp-container-manifests
+mkdir -p %{buildroot}%{_datadir}/caasp-container-manifests
 echo -e "#!/bin/bash\ntrue" > 
%{buildroot}%{_datadir}/caasp-container-manifests/activate.sh
 chmod 755 %{buildroot}%{_datadir}/caasp-container-manifests/activate.sh
 %endif
@@ -81,9 +62,6 @@
 %service_add_pre adjust-cloud-cfg.service setup-salt-minion.service
 
 %post
-if [ -f /etc/fstab -a ! -f /etc/fstab.sys ]; then
-  /usr/sbin/setup-fstab.sys-for-overlayfs ||:
-fi
 %service_add_post adjust-cloud-cfg.service setup-salt-minion.service
 exit 0
 
@@ -94,8 +72,7 @@
 %service_del_postun adjust-cloud-cfg.service setup-salt-minion.service
 
 %files
-%defattr(-,root,root)
-%doc %{_docdir}/%{name}
+%license COPYING
 %config %{_sysconfdir}/systemd/system/systemd-firstboot.service
 %config %{_sysconfdir}/salt/minion.d/grains_refresh.conf
 %{_unitdir}
@@ -103,13 +80,7 @@
 %{_libexecdir}/python*
 %{_sbindir}/adjust-cloud-cfg
 %{_sbindir}/create_autoyast_profile
-%{_sbindir}/setup-fstab.sys-for-overlayfs
 %{_mandir}/man8/create_autoyast_profile.8*
-%{_localstatedir}/lib/overlay
-%dir %{_localstatedir}/adm/netconfig
-%dir %{_prefix}/lib/dracut
-%dir %{_prefix}/lib/dracut/modules.d
-%{_prefix}/lib/dracut/modules.d/99SUSE_MicroOS
 %if ! 0%{?is_susecaasp}
 %dir %{_datadir}/caasp-container-manifests
 %{_datadir}/caasp-container-manifests/activate.sh

++ MicroOS-tools-0.27.tar.bz2 -> MicroOS-tools-0.28.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 

commit caasp-tools for openSUSE:Factory

2018-02-22 Thread root
Hello community,

here is the log from the commit of package caasp-tools for openSUSE:Factory 
checked in at 2018-02-22 15:01:08

Comparing /work/SRC/openSUSE:Factory/caasp-tools (Old)
 and  /work/SRC/openSUSE:Factory/.caasp-tools.new (New)


Package is "caasp-tools"

Thu Feb 22 15:01:08 2018 rev:15 rq:578630 version:0.27

Changes:

--- /work/SRC/openSUSE:Factory/caasp-tools/caasp-tools.changes  2018-02-01 
21:31:46.130392326 +0100
+++ /work/SRC/openSUSE:Factory/.caasp-tools.new/caasp-tools.changes 
2018-02-22 15:01:09.988765754 +0100
@@ -1,0 +2,5 @@
+Wed Feb 21 11:05:54 CET 2018 - ku...@suse.de
+
+- Add new hardware and apparmor pattern [bsc#1081620].
+
+---



Other differences:
--
++ caasp-tools.spec ++
--- /var/tmp/diff_new_pack.LFLTm0/_old  2018-02-22 15:01:11.556709346 +0100
+++ /var/tmp/diff_new_pack.LFLTm0/_new  2018-02-22 15:01:11.560709203 +0100
@@ -20,7 +20,7 @@
 Version:0.27
 Release:0
 Summary:Files and Scripts for SUSE CaaS Platform
-License:GPL-2.0+
+License:GPL-2.0-or-later
 Group:  Development/Tools/Other
 Source0:MicroOS-tools-%{version}.tar.bz2
 Source1:create_autoyast_profile.pl

++ create_autoyast_profile.pl ++
--- /var/tmp/diff_new_pack.LFLTm0/_old  2018-02-22 15:01:11.668705317 +0100
+++ /var/tmp/diff_new_pack.LFLTm0/_new  2018-02-22 15:01:11.668705317 +0100
@@ -250,8 +250,8 @@
 
 
   SUSE-MicroOS
-
-
+  SUSE-MicroOS-hardware
+  SUSE-MicroOS-apparmor
   SUSE-CaaSP-Stack
 
   




commit caasp-tools for openSUSE:Factory

2018-02-01 Thread root
Hello community,

here is the log from the commit of package caasp-tools for openSUSE:Factory 
checked in at 2018-02-01 21:30:58

Comparing /work/SRC/openSUSE:Factory/caasp-tools (Old)
 and  /work/SRC/openSUSE:Factory/.caasp-tools.new (New)


Package is "caasp-tools"

Thu Feb  1 21:30:58 2018 rev:14 rq:571722 version:0.27

Changes:

--- /work/SRC/openSUSE:Factory/caasp-tools/caasp-tools.changes  2018-01-17 
21:43:50.771827630 +0100
+++ /work/SRC/openSUSE:Factory/.caasp-tools.new/caasp-tools.changes 
2018-02-01 21:31:46.130392326 +0100
@@ -1,0 +2,8 @@
+Tue Jan 16 10:58:36 UTC 2018 - dims...@opensuse.org
+
+- Drop systemd and dracut BuildRequires: allow to better ordering
+  of parallel builds, and neither of the two BRs brings much
+  advantage. We just have to own /usr/lib/dracut directories as a
+  side effect (which is allowed).
+
+---



Other differences:
--
++ caasp-tools.spec ++
--- /var/tmp/diff_new_pack.jx0Mlb/_old  2018-02-01 21:31:46.630368937 +0100
+++ /var/tmp/diff_new_pack.jx0Mlb/_new  2018-02-01 21:31:46.634368749 +0100
@@ -27,14 +27,12 @@
 Source2:COPYING
 Source3:cc_suse_caasp.py
 BuildRequires:  distribution-release
-BuildRequires:  dracut
 %if 0%{?suse_version} < 1330
 BuildRequires:  python2-base
 %else
 BuildRequires:  python3-base
 %endif
 BuildRequires:  salt-minion
-BuildRequires:  systemd
 Requires:   perl-JSON
 #only needed as directory owners
 # Requires:   distribution-release systemd udev
@@ -109,6 +107,8 @@
 %{_mandir}/man8/create_autoyast_profile.8*
 %{_localstatedir}/lib/overlay
 %dir %{_localstatedir}/adm/netconfig
+%dir %{_prefix}/lib/dracut
+%dir %{_prefix}/lib/dracut/modules.d
 %{_prefix}/lib/dracut/modules.d/99SUSE_MicroOS
 %if ! 0%{?is_susecaasp}
 %dir %{_datadir}/caasp-container-manifests




commit caasp-tools for openSUSE:Factory

2018-01-17 Thread root
Hello community,

here is the log from the commit of package caasp-tools for openSUSE:Factory 
checked in at 2018-01-17 21:43:49

Comparing /work/SRC/openSUSE:Factory/caasp-tools (Old)
 and  /work/SRC/openSUSE:Factory/.caasp-tools.new (New)


Package is "caasp-tools"

Wed Jan 17 21:43:49 2018 rev:13 rq:565782 version:0.27

Changes:

--- /work/SRC/openSUSE:Factory/caasp-tools/caasp-tools.changes  2017-09-25 
13:59:55.166588357 +0200
+++ /work/SRC/openSUSE:Factory/.caasp-tools.new/caasp-tools.changes 
2018-01-17 21:43:50.771827630 +0100
@@ -1,0 +2,17 @@
+Tue Jan  9 14:35:10 CET 2018 - ku...@suse.de
+
+- create_autoyast_profile.pl: don't create a swap partition 
+
+---
+Wed Dec 20 19:03:36 CET 2017 - ku...@suse.de
+
+- Version 0.27
+  - Adjust that we have only /var
+
+---
+Sun Dec 17 08:40:36 UTC 2017 - ku...@suse.com
+
+- Version 0.26
+  - create apparmor overlay only if apparmor is installed
+
+---

Old:

  MicroOS-tools-0.25.tar.bz2

New:

  MicroOS-tools-0.27.tar.bz2



Other differences:
--
++ caasp-tools.spec ++
--- /var/tmp/diff_new_pack.DSvIBt/_old  2018-01-17 21:43:51.851777080 +0100
+++ /var/tmp/diff_new_pack.DSvIBt/_new  2018-01-17 21:43:51.851777080 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package caasp-tools
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:   caasp-tools
-Version:0.25
+Version:0.27
 Release:0
 Summary:Files and Scripts for SUSE CaaS Platform
 License:GPL-2.0+

++ MicroOS-tools-0.25.tar.bz2 -> MicroOS-tools-0.27.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/MicroOS-tools-0.25/usr/sbin/setup-fstab.sys-for-overlayfs 
new/MicroOS-tools-0.27/usr/sbin/setup-fstab.sys-for-overlayfs
--- old/MicroOS-tools-0.25/usr/sbin/setup-fstab.sys-for-overlayfs   
2017-09-12 10:17:44.721911367 +0200
+++ new/MicroOS-tools-0.27/usr/sbin/setup-fstab.sys-for-overlayfs   
2017-12-20 19:02:43.930403881 +0100
@@ -1,15 +1,13 @@
 #!/bin/bash
 
 if [ -f /etc/fstab ]; then
-grep "/var/lib/overlay" /etc/fstab | grep -v "^#" > /etc/fstab.sys
+grep "/var" /etc/fstab | grep -v "^#" > /etc/fstab.sys
 else
 # if there is no /etc/fstab, assume LABEL=ROOT. Most likely we are called 
by kiwi
-echo "LABEL=ROOT /var/lib/overlay btrfs defaults,subvol=@/var/lib/overlay 
0 0" > /etc/fstab.sys
+echo "LABEL=ROOT /var btrfs defaults,subvol=@/var 0 0" > /etc/fstab.sys
 fi
 
 # /etc/fstab.sys for dracut to mount overlayfs
 cat << EOF >> /etc/fstab.sys
 overlay /etc overlay 
defaults,lowerdir=/sysroot/etc,upperdir=/sysroot/var/lib/overlay/etc,workdir=/sysroot/var/lib/overlay/work-etc
 0 0
-overlay /var/adm/netconfig overlay 
defaults,lowerdir=/sysroot/var/adm/netconfig,upperdir=/sysroot/var/lib/overlay/netconfig,workdir=/sysroot/var/lib/overlay/work-netconfig
 0 0
-overlay /var/lib/apparmor overlay 
defaults,lowerdir=/sysroot/var/lib/apparmor,upperdir=/sysroot/var/lib/overlay/apparmor,workdir=/sysroot/var/lib/overlay/work-apparmor
 0 0
 EOF

++ create_autoyast_profile.pl ++
--- /var/tmp/diff_new_pack.DSvIBt/_old  2018-01-17 21:43:52.063767157 +0100
+++ /var/tmp/diff_new_pack.DSvIBt/_new  2018-01-17 21:43:52.063767157 +0100
@@ -159,10 +159,6 @@
   /
   30gb
 
-
-   swap
-   auto
- 
  
 btrfs
 /var/lib/docker




commit caasp-tools for openSUSE:Factory

2017-09-25 Thread root
Hello community,

here is the log from the commit of package caasp-tools for openSUSE:Factory 
checked in at 2017-09-25 13:59:52

Comparing /work/SRC/openSUSE:Factory/caasp-tools (Old)
 and  /work/SRC/openSUSE:Factory/.caasp-tools.new (New)


Package is "caasp-tools"

Mon Sep 25 13:59:52 2017 rev:12 rq:528516 version:0.25

Changes:

--- /work/SRC/openSUSE:Factory/caasp-tools/caasp-tools.changes  2017-09-23 
21:34:47.761517108 +0200
+++ /work/SRC/openSUSE:Factory/.caasp-tools.new/caasp-tools.changes 
2017-09-25 13:59:55.166588357 +0200
@@ -1,0 +2,5 @@
+Sun Sep 24 13:03:35 CEST 2017 - ku...@suse.de
+
+- On fix for cc_suse_caasp.py did go lost
+
+---



Other differences:
--
++ cc_suse_caasp.py ++
--- /var/tmp/diff_new_pack.bZ1Jya/_old  2017-09-25 13:59:56.146450494 +0200
+++ /var/tmp/diff_new_pack.bZ1Jya/_new  2017-09-25 13:59:56.146450494 +0200
@@ -51,7 +51,7 @@
 log.debug(("role administration node found"))
 cmd = ['/usr/share/caasp-container-manifests/activate.sh']
 util.subp(cmd, capture=True)
-   enable_service('admin-node-setup')
+enable_service('admin-node-setup')
 enable_service('docker')
 enable_service('container-feeder')
 enable_service('etcd')
@@ -64,7 +64,7 @@
   "no 'admin_node' found for cluster system role"), name)
 return
 admin_node = caasp_cfg['admin_node']
-   
+
 contents = "master: %s" % (admin_node)
 util.write_file('/etc/salt/minion.d/master.conf', contents, 
mode=DEFAULT_PERMS)
 sed_arg = "s|#NTP=.*|NTP=%s|g" % (admin_node)




commit caasp-tools for openSUSE:Factory

2017-09-23 Thread root
Hello community,

here is the log from the commit of package caasp-tools for openSUSE:Factory 
checked in at 2017-09-23 21:34:40

Comparing /work/SRC/openSUSE:Factory/caasp-tools (Old)
 and  /work/SRC/openSUSE:Factory/.caasp-tools.new (New)


Package is "caasp-tools"

Sat Sep 23 21:34:40 2017 rev:11 rq:528139 version:0.25

Changes:

--- /work/SRC/openSUSE:Factory/caasp-tools/caasp-tools.changes  2017-09-13 
22:37:21.700253957 +0200
+++ /work/SRC/openSUSE:Factory/.caasp-tools.new/caasp-tools.changes 
2017-09-23 21:34:47.761517108 +0200
@@ -1,0 +2,6 @@
+Thu Sep 21 19:50:18 UTC 2017 - ku...@suse.de
+
+- Move cc_suse_caasp.py out of tar archive and install with in the
+  right python directory
+
+---

Old:

  MicroOS-tools-0.24.tar.bz2

New:

  MicroOS-tools-0.25.tar.bz2
  cc_suse_caasp.py



Other differences:
--
++ caasp-tools.spec ++
--- /var/tmp/diff_new_pack.7SRh6p/_old  2017-09-23 21:34:48.513411366 +0200
+++ /var/tmp/diff_new_pack.7SRh6p/_new  2017-09-23 21:34:48.517410803 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   caasp-tools
-Version:0.24
+Version:0.25
 Release:0
 Summary:Files and Scripts for SUSE CaaS Platform
 License:GPL-2.0+
@@ -25,8 +25,14 @@
 Source0:MicroOS-tools-%{version}.tar.bz2
 Source1:create_autoyast_profile.pl
 Source2:COPYING
+Source3:cc_suse_caasp.py
 BuildRequires:  distribution-release
 BuildRequires:  dracut
+%if 0%{?suse_version} < 1330
+BuildRequires:  python2-base
+%else
+BuildRequires:  python3-base
+%endif
 BuildRequires:  salt-minion
 BuildRequires:  systemd
 Requires:   perl-JSON
@@ -62,6 +68,11 @@
 pod2man %{SOURCE1} > %{buildroot}%{_mandir}/man8/create_autoyast_profile.8
 mkdir -p %{buildroot}%{_docdir}/%{name}
 install -D -m644 %{SOURCE2} %{buildroot}%{_docdir}/%{name}/COPYING
+%if 0%{?suse_version} < 1330
+install -D -m644 %{SOURCE3} 
%{buildroot}%{python_sitelib}/cloudinit/config/cc_suse_caasp.py
+%else
+install -D -m644 %{SOURCE3} 
%{buildroot}%{python3_sitelib}/cloudinit/config/cc_suse_caasp.py
+%endif
 %if ! 0%{?is_susecaasp}
 mkdir -p %{buildroot}/usr/share/caasp-container-manifests
 echo -e "#!/bin/bash\ntrue" > 
%{buildroot}%{_datadir}/caasp-container-manifests/activate.sh

++ MicroOS-tools-0.24.tar.bz2 -> MicroOS-tools-0.25.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/MicroOS-tools-0.24/usr/lib/python2.7/site-packages/cloudinit/config/cc_suse_caasp.py
 
new/MicroOS-tools-0.25/usr/lib/python2.7/site-packages/cloudinit/config/cc_suse_caasp.py
--- 
old/MicroOS-tools-0.24/usr/lib/python2.7/site-packages/cloudinit/config/cc_suse_caasp.py
2017-06-27 15:30:45.373885191 +0200
+++ 
new/MicroOS-tools-0.25/usr/lib/python2.7/site-packages/cloudinit/config/cc_suse_caasp.py
1970-01-01 01:00:00.0 +0100
@@ -1,79 +0,0 @@
-# vi: ts=4 expandtab
-#
-#Copyright (C) 2017 SUSE LLC
-#
-#Author: Thorsten Kukuk 
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public License
-#in Version 2 or later as published by the Free Software Foundation.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU General Public License
-#along with this program.  If not, see .
-
-from cloudinit.settings import PER_INSTANCE
-from cloudinit import util
-
-frequency = PER_INSTANCE
-
-DEFAULT_PERMS = 0o644
-
-# suse_caasp:
-#  role: [admin|cluster]
-#  admin_node: admin-node.example.com
-
-def enable_service(service):
-cmd = ['systemctl', 'enable', '--now', service]
-util.subp(cmd, capture=True)
-
-def handle(name, cfg, cloud, log, args):
-if len(args) != 0:
-caasp_cfg = util.read_conf(args[0])
-else:
-if 'suse_caasp' not in cfg:
-log.debug(("Skipping module named %s, "
-   "no 'suse_caasp' configuration found"), name)
-return
-caasp_cfg = cfg['suse_caasp']
-
-if 'role' not in caasp_cfg:
-log.warn(("Skipping module named %s, "
-  "no 'role' found in 'suse_caasp' configuration"), name)
-return
-system_role = caasp_cfg['role']
-
-if system_role == 'admin':
-log.debug(("role administration node found"))
-cmd = ['/usr/share/caasp-container-manifests/activate.sh']
-util.subp(cmd, capture=True)
-  

commit caasp-tools for openSUSE:Factory

2017-09-13 Thread root
Hello community,

here is the log from the commit of package caasp-tools for openSUSE:Factory 
checked in at 2017-09-13 22:37:01

Comparing /work/SRC/openSUSE:Factory/caasp-tools (Old)
 and  /work/SRC/openSUSE:Factory/.caasp-tools.new (New)


Package is "caasp-tools"

Wed Sep 13 22:37:01 2017 rev:10 rq:523892 version:0.24

Changes:

--- /work/SRC/openSUSE:Factory/caasp-tools/caasp-tools.changes  2017-08-30 
16:23:39.905591325 +0200
+++ /work/SRC/openSUSE:Factory/.caasp-tools.new/caasp-tools.changes 
2017-09-13 22:37:21.700253957 +0200
@@ -1,0 +2,6 @@
+Tue Sep 12 10:18:48 CEST 2017 - ku...@suse.de
+
+- setup-fstab.sys-for-overlayfs: adjust to work with building
+  images with kiwi
+
+---

Old:

  MicroOS-tools-0.23.tar.bz2

New:

  MicroOS-tools-0.24.tar.bz2



Other differences:
--
++ caasp-tools.spec ++
--- /var/tmp/diff_new_pack.Ye6Rp3/_old  2017-09-13 22:37:23.348021955 +0200
+++ /var/tmp/diff_new_pack.Ye6Rp3/_new  2017-09-13 22:37:23.352021392 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   caasp-tools
-Version:0.23
+Version:0.24
 Release:0
 Summary:Files and Scripts for SUSE CaaS Platform
 License:GPL-2.0+

++ MicroOS-tools-0.23.tar.bz2 -> MicroOS-tools-0.24.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/MicroOS-tools-0.23/usr/sbin/setup-fstab.sys-for-overlayfs 
new/MicroOS-tools-0.24/usr/sbin/setup-fstab.sys-for-overlayfs
--- old/MicroOS-tools-0.23/usr/sbin/setup-fstab.sys-for-overlayfs   
2017-06-07 17:34:23.101602867 +0200
+++ new/MicroOS-tools-0.24/usr/sbin/setup-fstab.sys-for-overlayfs   
2017-09-12 10:17:44.721911367 +0200
@@ -1,8 +1,11 @@
 #!/bin/bash
 
-test -f /etc/fstab || exit 1
-
-grep "/var/lib/overlay" /etc/fstab | grep -v "^#" > /etc/fstab.sys
+if [ -f /etc/fstab ]; then
+grep "/var/lib/overlay" /etc/fstab | grep -v "^#" > /etc/fstab.sys
+else
+# if there is no /etc/fstab, assume LABEL=ROOT. Most likely we are called 
by kiwi
+echo "LABEL=ROOT /var/lib/overlay btrfs defaults,subvol=@/var/lib/overlay 
0 0" > /etc/fstab.sys
+fi
 
 # /etc/fstab.sys for dracut to mount overlayfs
 cat << EOF >> /etc/fstab.sys
@@ -10,4 +13,3 @@
 overlay /var/adm/netconfig overlay 
defaults,lowerdir=/sysroot/var/adm/netconfig,upperdir=/sysroot/var/lib/overlay/netconfig,workdir=/sysroot/var/lib/overlay/work-netconfig
 0 0
 overlay /var/lib/apparmor overlay 
defaults,lowerdir=/sysroot/var/lib/apparmor,upperdir=/sysroot/var/lib/overlay/apparmor,workdir=/sysroot/var/lib/overlay/work-apparmor
 0 0
 EOF
-




commit caasp-tools for openSUSE:Factory

2017-08-30 Thread root
Hello community,

here is the log from the commit of package caasp-tools for openSUSE:Factory 
checked in at 2017-08-30 16:23:12

Comparing /work/SRC/openSUSE:Factory/caasp-tools (Old)
 and  /work/SRC/openSUSE:Factory/.caasp-tools.new (New)


Package is "caasp-tools"

Wed Aug 30 16:23:12 2017 rev:9 rq:519328 version:0.23

Changes:

--- /work/SRC/openSUSE:Factory/caasp-tools/caasp-tools.changes  2017-08-04 
12:00:12.088671159 +0200
+++ /work/SRC/openSUSE:Factory/.caasp-tools.new/caasp-tools.changes 
2017-08-30 16:23:39.905591325 +0200
@@ -1,0 +2,6 @@
+Tue Aug 29 12:21:02 CEST 2017 - ku...@suse.de
+
+- Add /boot/efi partition to the create_autoyast_profile
+  script [bsc#1055795]
+
+---



Other differences:
--
++ create_autoyast_profile.pl ++
--- /var/tmp/diff_new_pack.81nfpW/_old  2017-08-30 16:23:40.605492872 +0200
+++ /var/tmp/diff_new_pack.81nfpW/_new  2017-08-30 16:23:40.613491747 +0200
@@ -150,6 +150,12 @@
   all
   
 
+  /boot/efi
+  200mb
+ 1
+  vfat
+
+
   /
   30gb
 




commit caasp-tools for openSUSE:Factory

2017-08-04 Thread root
Hello community,

here is the log from the commit of package caasp-tools for openSUSE:Factory 
checked in at 2017-08-04 12:00:03

Comparing /work/SRC/openSUSE:Factory/caasp-tools (Old)
 and  /work/SRC/openSUSE:Factory/.caasp-tools.new (New)


Package is "caasp-tools"

Fri Aug  4 12:00:03 2017 rev:8 rq:514036 version:0.23

Changes:

--- /work/SRC/openSUSE:Factory/caasp-tools/caasp-tools.changes  2017-06-23 
09:18:44.031306326 +0200
+++ /work/SRC/openSUSE:Factory/.caasp-tools.new/caasp-tools.changes 
2017-08-04 12:00:12.088671159 +0200
@@ -1,0 +2,16 @@
+Fri Jun 30 13:20:39 CEST 2017 - ku...@suse.de
+
+- Fix problem with wrong permissions of /etc/salt.
+
+---
+Wed Jun 28 13:07:22 CEST 2017 - ku...@suse.de
+
+- Add /etc/salt/minion.d/grains_refresh.conf [bsc#1046212]
+
+---
+Tue Jun 27 15:31:06 CEST 2017 - ku...@suse.de
+
+- Enable admin-note-setup service on admin node via cloud-init
+  [bsc#1046161]
+
+---

Old:

  MicroOS-tools-0.21.tar.bz2

New:

  MicroOS-tools-0.23.tar.bz2



Other differences:
--
++ caasp-tools.spec ++
--- /var/tmp/diff_new_pack.yqHH3f/_old  2017-08-04 12:00:13.792430675 +0200
+++ /var/tmp/diff_new_pack.yqHH3f/_new  2017-08-04 12:00:13.796430111 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   caasp-tools
-Version:0.21
+Version:0.23
 Release:0
 Summary:Files and Scripts for SUSE CaaS Platform
 License:GPL-2.0+
@@ -27,6 +27,7 @@
 Source2:COPYING
 BuildRequires:  distribution-release
 BuildRequires:  dracut
+BuildRequires:  salt-minion
 BuildRequires:  systemd
 Requires:   perl-JSON
 #only needed as directory owners
@@ -87,6 +88,7 @@
 %defattr(-,root,root)
 %doc %{_docdir}/%{name}
 %config %{_sysconfdir}/systemd/system/systemd-firstboot.service
+%config %{_sysconfdir}/salt/minion.d/grains_refresh.conf
 %{_unitdir}
 %{_libexecdir}/MicroOS-firstboot
 %{_libexecdir}/python*

++ MicroOS-tools-0.21.tar.bz2 -> MicroOS-tools-0.23.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/MicroOS-tools-0.21/etc/salt/minion.d/grains_refresh.conf 
new/MicroOS-tools-0.23/etc/salt/minion.d/grains_refresh.conf
--- old/MicroOS-tools-0.21/etc/salt/minion.d/grains_refresh.conf
1970-01-01 01:00:00.0 +0100
+++ new/MicroOS-tools-0.23/etc/salt/minion.d/grains_refresh.conf
2017-06-28 13:02:00.893268571 +0200
@@ -0,0 +1 @@
+grains_refresh_every: 10
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/MicroOS-tools-0.21/usr/lib/python2.7/site-packages/cloudinit/config/cc_suse_caasp.py
 
new/MicroOS-tools-0.23/usr/lib/python2.7/site-packages/cloudinit/config/cc_suse_caasp.py
--- 
old/MicroOS-tools-0.21/usr/lib/python2.7/site-packages/cloudinit/config/cc_suse_caasp.py
2017-06-21 16:08:58.478547513 +0200
+++ 
new/MicroOS-tools-0.23/usr/lib/python2.7/site-packages/cloudinit/config/cc_suse_caasp.py
2017-06-27 15:30:45.373885191 +0200
@@ -51,6 +51,7 @@
 log.debug(("role administration node found"))
 cmd = ['/usr/share/caasp-container-manifests/activate.sh']
 util.subp(cmd, capture=True)
+   enable_service('admin-node-setup')
 enable_service('docker')
 enable_service('container-feeder')
 enable_service('etcd')




commit caasp-tools for openSUSE:Factory

2017-06-23 Thread root
Hello community,

here is the log from the commit of package caasp-tools for openSUSE:Factory 
checked in at 2017-06-23 09:18:12

Comparing /work/SRC/openSUSE:Factory/caasp-tools (Old)
 and  /work/SRC/openSUSE:Factory/.caasp-tools.new (New)


Package is "caasp-tools"

Fri Jun 23 09:18:12 2017 rev:7 rq:505616 version:0.21

Changes:

--- /work/SRC/openSUSE:Factory/caasp-tools/caasp-tools.changes  2017-06-08 
15:03:58.914735216 +0200
+++ /work/SRC/openSUSE:Factory/.caasp-tools.new/caasp-tools.changes 
2017-06-23 09:18:44.031306326 +0200
@@ -1,0 +2,6 @@
+Thu Jun 22 09:55:58 CEST 2017 - ku...@suse.de
+
+- suse_caasp cloud-init module: enable salt-minion on admin node
+  [bsc#1045350]
+
+---

Old:

  MicroOS-tools-0.20.tar.bz2

New:

  MicroOS-tools-0.21.tar.bz2



Other differences:
--
++ caasp-tools.spec ++
--- /var/tmp/diff_new_pack.MHM3k3/_old  2017-06-23 09:18:44.567230599 +0200
+++ /var/tmp/diff_new_pack.MHM3k3/_new  2017-06-23 09:18:44.567230599 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   caasp-tools
-Version:0.20
+Version:0.21
 Release:0
 Summary:Files and Scripts for SUSE CaaS Platform
 License:GPL-2.0+

++ MicroOS-tools-0.20.tar.bz2 -> MicroOS-tools-0.21.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/MicroOS-tools-0.20/usr/lib/python2.7/site-packages/cloudinit/config/cc_suse_caasp.py
 
new/MicroOS-tools-0.21/usr/lib/python2.7/site-packages/cloudinit/config/cc_suse_caasp.py
--- 
old/MicroOS-tools-0.20/usr/lib/python2.7/site-packages/cloudinit/config/cc_suse_caasp.py
2017-06-07 17:53:44.475635036 +0200
+++ 
new/MicroOS-tools-0.21/usr/lib/python2.7/site-packages/cloudinit/config/cc_suse_caasp.py
2017-06-21 16:08:58.478547513 +0200
@@ -55,6 +55,7 @@
 enable_service('container-feeder')
 enable_service('etcd')
 enable_service('kubelet')
+enable_service('salt-minion')
 elif system_role == 'cluster':
 log.debug(("role cluster node found"))
 if 'admin_node' not in caasp_cfg:




commit caasp-tools for openSUSE:Factory

2017-06-08 Thread root
Hello community,

here is the log from the commit of package caasp-tools for openSUSE:Factory 
checked in at 2017-06-08 15:03:48

Comparing /work/SRC/openSUSE:Factory/caasp-tools (Old)
 and  /work/SRC/openSUSE:Factory/.caasp-tools.new (New)


Package is "caasp-tools"

Thu Jun  8 15:03:48 2017 rev:6 rq:501789 version:0.20

Changes:

--- /work/SRC/openSUSE:Factory/caasp-tools/caasp-tools.changes  2017-05-17 
17:20:13.285275450 +0200
+++ /work/SRC/openSUSE:Factory/.caasp-tools.new/caasp-tools.changes 
2017-06-08 15:03:58.914735216 +0200
@@ -1,0 +2,17 @@
+Wed Jun  7 17:37:19 CEST 2017 - ku...@suse.de
+
+- Fix syntax of /etc/fstab.sys for overlayfs mount points
+
+---
+Fri Jun  2 09:29:22 CEST 2017 - ku...@suse.de
+
+- suse_caasp cloud-init module: fix order of docker start
+
+---
+Sat May 27 18:13:36 UTC 2017 - ku...@suse.com
+
+- Release version 0.18
+- Enable docker and container-feeder on cluster nodes
+- Cleanup build requires
+
+---

Old:

  MicroOS-tools-0.17.tar.bz2

New:

  MicroOS-tools-0.20.tar.bz2



Other differences:
--
++ caasp-tools.spec ++
--- /var/tmp/diff_new_pack.oZyQgA/_old  2017-06-08 15:04:02.442237386 +0200
+++ /var/tmp/diff_new_pack.oZyQgA/_new  2017-06-08 15:04:02.442237386 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   caasp-tools
-Version:0.17
+Version:0.20
 Release:0
 Summary:Files and Scripts for SUSE CaaS Platform
 License:GPL-2.0+
@@ -27,9 +27,7 @@
 Source2:COPYING
 BuildRequires:  distribution-release
 BuildRequires:  dracut
-BuildRequires:  snapper
 BuildRequires:  systemd
-BuildRequires:  udev
 Requires:   perl-JSON
 #only needed as directory owners
 # Requires:   distribution-release systemd udev

++ MicroOS-tools-0.17.tar.bz2 -> MicroOS-tools-0.20.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/MicroOS-tools-0.17/usr/lib/python2.7/site-packages/cloudinit/config/cc_suse_caasp.py
 
new/MicroOS-tools-0.20/usr/lib/python2.7/site-packages/cloudinit/config/cc_suse_caasp.py
--- 
old/MicroOS-tools-0.17/usr/lib/python2.7/site-packages/cloudinit/config/cc_suse_caasp.py
2017-04-21 13:29:17.233681387 +0200
+++ 
new/MicroOS-tools-0.20/usr/lib/python2.7/site-packages/cloudinit/config/cc_suse_caasp.py
2017-06-07 17:53:44.475635036 +0200
@@ -51,8 +51,8 @@
 log.debug(("role administration node found"))
 cmd = ['/usr/share/caasp-container-manifests/activate.sh']
 util.subp(cmd, capture=True)
-enable_service('container-feeder')
 enable_service('docker')
+enable_service('container-feeder')
 enable_service('etcd')
 enable_service('kubelet')
 elif system_role == 'cluster':
@@ -69,6 +69,7 @@
 cmd = ['sed', '-i', '-e', sed_arg, '/etc/systemd/timesyncd.conf']
 util.subp(cmd, capture=True)
 
+enable_service('docker')
 enable_service('container-feeder')
 enable_service('salt-minion')
 enable_service('systemd-timesyncd')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/MicroOS-tools-0.17/usr/sbin/setup-fstab.sys-for-overlayfs 
new/MicroOS-tools-0.20/usr/sbin/setup-fstab.sys-for-overlayfs
--- old/MicroOS-tools-0.17/usr/sbin/setup-fstab.sys-for-overlayfs   
2017-04-12 13:54:20.354984723 +0200
+++ new/MicroOS-tools-0.20/usr/sbin/setup-fstab.sys-for-overlayfs   
2017-06-07 17:34:23.101602867 +0200
@@ -2,4 +2,12 @@
 
 test -f /etc/fstab || exit 1
 
-grep "/var/lib/overlay" /etc/fstab | awk '{ if ($1 != "" && $1 !~ "#") print 
$0"\n"$1" /etc overlay 
defaults,lowerdir=/sysroot/etc,upperdir=/sysroot/var/lib/overlay/etc,workdir=/sysroot/var/lib/overlay/work-etc
 0 0\n"$1" /var/adm/netconfig overlay 
defaults,lowerdir=/sysroot/var/adm/netconfig,upperdir=/sysroot/var/lib/overlay/netconfig,workdir=/sysroot/var/lib/overlay/work-netconfig
 0 0\n"$1" /var/lib/apparmor overlay 
defaults,lowerdir=/sysroot/var/lib/apparmor,upperdir=/sysroot/var/lib/overlay/apparmor,workdir=/sysroot/var/lib/overlay/work-apparmor
 0 0" }'> /etc/fstab.sys
+grep "/var/lib/overlay" /etc/fstab | grep -v "^#" > /etc/fstab.sys
+
+# /etc/fstab.sys for dracut to mount overlayfs
+cat << EOF >> /etc/fstab.sys
+overlay /etc overlay 
defaults,lowerdir=/sysroot/etc,upperdir=/sysroot/var/lib/overlay/etc,workdir=/sysroot/var/lib/overlay/work-etc
 0 0
+overlay /var/adm/netconfig overlay 

commit caasp-tools for openSUSE:Factory

2017-05-17 Thread root
Hello community,

here is the log from the commit of package caasp-tools for openSUSE:Factory 
checked in at 2017-05-17 17:18:56

Comparing /work/SRC/openSUSE:Factory/caasp-tools (Old)
 and  /work/SRC/openSUSE:Factory/.caasp-tools.new (New)


Package is "caasp-tools"

Wed May 17 17:18:56 2017 rev:5 rq:495515 version:0.17

Changes:

--- /work/SRC/openSUSE:Factory/caasp-tools/caasp-tools.changes  2017-05-09 
18:10:37.317539765 +0200
+++ /work/SRC/openSUSE:Factory/.caasp-tools.new/caasp-tools.changes 
2017-05-17 17:20:13.285275450 +0200
@@ -1,0 +2,5 @@
+Wed May 17 09:05:53 CEST 2017 - ku...@suse.de
+
+- Adjust pattern names [bsc#1039432]
+
+---



Other differences:
--
++ create_autoyast_profile.pl ++
--- /var/tmp/diff_new_pack.GB6xln/_old  2017-05-17 17:20:14.621087059 +0200
+++ /var/tmp/diff_new_pack.GB6xln/_new  2017-05-17 17:20:14.625086494 +0200
@@ -247,10 +247,10 @@
 false
 
 
-  MicroOS
+  SUSE-MicroOS
 
 
-  Stack
+  SUSE-CaaSP-Stack
 
   
 EOT




commit caasp-tools for openSUSE:Factory

2017-05-09 Thread root
Hello community,

here is the log from the commit of package caasp-tools for openSUSE:Factory 
checked in at 2017-05-09 18:10:36

Comparing /work/SRC/openSUSE:Factory/caasp-tools (Old)
 and  /work/SRC/openSUSE:Factory/.caasp-tools.new (New)


Package is "caasp-tools"

Tue May  9 18:10:36 2017 rev:4 rq:493768 version:0.17

Changes:

--- /work/SRC/openSUSE:Factory/caasp-tools/caasp-tools.changes  2017-05-04 
15:05:07.480342769 +0200
+++ /work/SRC/openSUSE:Factory/.caasp-tools.new/caasp-tools.changes 
2017-05-09 18:10:37.317539765 +0200
@@ -1,0 +2,5 @@
+Tue May  9 15:04:56 CEST 2017 - ku...@suse.de
+
+- Add activate.sh for openSUSE Kubic
+
+---



Other differences:
--
++ caasp-tools.spec ++
--- /var/tmp/diff_new_pack.P0dq7o/_old  2017-05-09 18:10:38.233410342 +0200
+++ /var/tmp/diff_new_pack.P0dq7o/_new  2017-05-09 18:10:38.237409777 +0200
@@ -63,6 +63,11 @@
 pod2man %{SOURCE1} > %{buildroot}%{_mandir}/man8/create_autoyast_profile.8
 mkdir -p %{buildroot}%{_docdir}/%{name}
 install -D -m644 %{SOURCE2} %{buildroot}%{_docdir}/%{name}/COPYING
+%if ! 0%{?is_susecaasp}
+mkdir -p %{buildroot}/usr/share/caasp-container-manifests
+echo -e "#!/bin/bash\ntrue" > 
%{buildroot}%{_datadir}/caasp-container-manifests/activate.sh
+chmod 755 %{buildroot}%{_datadir}/caasp-container-manifests/activate.sh
+%endif
 
 %pre
 %service_add_pre adjust-cloud-cfg.service setup-salt-minion.service
@@ -94,5 +99,9 @@
 %{_localstatedir}/lib/overlay
 %dir %{_localstatedir}/adm/netconfig
 %{_prefix}/lib/dracut/modules.d/99SUSE_MicroOS
+%if ! 0%{?is_susecaasp}
+%dir %{_datadir}/caasp-container-manifests
+%{_datadir}/caasp-container-manifests/activate.sh
+%endif
 
 %changelog




commit caasp-tools for openSUSE:Factory

2017-05-04 Thread root
Hello community,

here is the log from the commit of package caasp-tools for openSUSE:Factory 
checked in at 2017-05-04 15:05:04

Comparing /work/SRC/openSUSE:Factory/caasp-tools (Old)
 and  /work/SRC/openSUSE:Factory/.caasp-tools.new (New)


Package is "caasp-tools"

Thu May  4 15:05:04 2017 rev:3 rq:492419 version:0.17

Changes:

--- /work/SRC/openSUSE:Factory/caasp-tools/caasp-tools.changes  2017-04-25 
08:58:33.959884563 +0200
+++ /work/SRC/openSUSE:Factory/.caasp-tools.new/caasp-tools.changes 
2017-05-04 15:05:07.480342769 +0200
@@ -1,0 +2,5 @@
+Mon Apr 24 11:40:31 CEST 2017 - ku...@suse.de
+
+- create_autoyast_profile: use FQDN [bsc#1035665]
+
+---



Other differences:
--
++ create_autoyast_profile.pl ++
--- /var/tmp/diff_new_pack.D6uTJ6/_old  2017-05-04 15:05:08.624181275 +0200
+++ /var/tmp/diff_new_pack.D6uTJ6/_new  2017-05-04 15:05:08.624181275 +0200
@@ -12,7 +12,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License along
-# with this program; if not, see . */
+# with this program; if not, see .
 #
 
 =head1 NAME
@@ -46,11 +46,11 @@
 use locale;
 use Pod::Usage;
 use Getopt::Long;
-use Sys::Hostname;
+use Net::Domain qw(hostname hostfqdn);
 use JSON qw(decode_json);
 
 my $outputfile = "-";
-my $saltmaster = hostname();
+my $saltmaster = hostfqdn();
 my $ntp_server = "";
 my $smturl = "";
 my $reg_email = "";
@@ -320,7 +320,7 @@
 




commit caasp-tools for openSUSE:Factory

2017-04-25 Thread root
Hello community,

here is the log from the commit of package caasp-tools for openSUSE:Factory 
checked in at 2017-04-25 08:58:32

Comparing /work/SRC/openSUSE:Factory/caasp-tools (Old)
 and  /work/SRC/openSUSE:Factory/.caasp-tools.new (New)


Package is "caasp-tools"

Tue Apr 25 08:58:32 2017 rev:2 rq:489801 version:0.17

Changes:

--- /work/SRC/openSUSE:Factory/caasp-tools/caasp-tools.changes  2017-04-18 
13:48:35.741778535 +0200
+++ /work/SRC/openSUSE:Factory/.caasp-tools.new/caasp-tools.changes 
2017-04-25 08:58:33.959884563 +0200
@@ -1,0 +2,60 @@
+Fri Apr 21 13:29:41 CEST 2017 - ku...@suse.de
+
+- Fix order: first write config, afterwards start services
+
+---
+Fri Apr 21 11:16:06 CEST 2017 - ku...@suse.de
+
+- remove not working line from autoyast.xml
+- Add COPYING file
+
+---
+Thu Apr 20 17:09:50 CEST 2017 - ku...@suse.de
+
+- Add suse_caasp cloud-init module
+- Fix syntax of 01-network.cfg in case we don't disable cloud-init 
+  network
+
+---
+Wed Apr 19 12:56:51 UTC 2017 - ku...@suse.com
+
+- Add extra /var/lib/docker partition to autoyast profile
+
+---
+Wed Apr 19 09:54:06 CEST 2017 - ku...@suse.de
+
+- Add systemd pre/post install macros
+
+---
+Tue Apr 18 17:07:30 CEST 2017 - ku...@suse.de
+
+- Add apparmor directories for overlayfs
+
+---
+Tue Apr 18 16:05:19 CEST 2017 - ku...@suse.de
+
+- Fix typo
+
+---
+Tue Apr 18 15:02:57 CEST 2017 - ku...@suse.de
+
+- If we do the first boot and there is already a configuration file
+  for the network configuration, don't let cloud-init overwrite
+  that [bsc#1032497]
+
+---
+Wed Apr 12 15:48:50 CEST 2017 - ku...@suse.de
+
+- Add systemd service to create minion id [bsc#1031623]
+
+---
+Wed Apr 12 13:58:01 CEST 2017 - ku...@suse.de
+
+- Use overlayfs for /var/lib/apparmor
+
+---
+Sun Apr  2 09:35:51 UTC 2017 - ku...@suse.de
+
+- Add ntpd configuration
+
+---

Old:

  MicroOS-tools-0.13.tar.bz2

New:

  COPYING
  MicroOS-tools-0.17.tar.bz2



Other differences:
--
++ caasp-tools.spec ++
--- /var/tmp/diff_new_pack.TMqq4F/_old  2017-04-25 08:58:36.767487573 +0200
+++ /var/tmp/diff_new_pack.TMqq4F/_new  2017-04-25 08:58:36.767487573 +0200
@@ -17,13 +17,14 @@
 
 
 Name:   caasp-tools
-Version:0.13
+Version:0.17
 Release:0
 Summary:Files and Scripts for SUSE CaaS Platform
 License:GPL-2.0+
 Group:  Development/Tools/Other
 Source0:MicroOS-tools-%{version}.tar.bz2
 Source1:create_autoyast_profile.pl
+Source2:COPYING
 BuildRequires:  distribution-release
 BuildRequires:  dracut
 BuildRequires:  snapper
@@ -34,6 +35,7 @@
 # Requires:   distribution-release systemd udev
 Requires:   util-linux
 Requires(post): awk
+%{?systemd_requires}
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildArch:  noarch
 
@@ -55,20 +57,37 @@
 mkdir -p %{buildroot}%{_localstatedir}/lib/overlay/work-etc
 mkdir -p %{buildroot}%{_localstatedir}/lib/overlay/netconfig
 mkdir -p %{buildroot}%{_localstatedir}/lib/overlay/work-netconfig
+mkdir -p %{buildroot}%{_localstatedir}/lib/overlay/apparmor
+mkdir -p %{buildroot}%{_localstatedir}/lib/overlay/work-apparmor
 mkdir -p %{buildroot}%{_mandir}/man8
 pod2man %{SOURCE1} > %{buildroot}%{_mandir}/man8/create_autoyast_profile.8
+mkdir -p %{buildroot}%{_docdir}/%{name}
+install -D -m644 %{SOURCE2} %{buildroot}%{_docdir}/%{name}/COPYING
+
+%pre
+%service_add_pre adjust-cloud-cfg.service setup-salt-minion.service
 
 %post
 if [ -f /etc/fstab -a ! -f /etc/fstab.sys ]; then
   /usr/sbin/setup-fstab.sys-for-overlayfs ||:
 fi
+%service_add_post adjust-cloud-cfg.service setup-salt-minion.service
 exit 0
 
+%preun
+%service_del_preun adjust-cloud-cfg.service setup-salt-minion.service
+
+%postun
+%service_del_postun adjust-cloud-cfg.service setup-salt-minion.service
+
 %files
 %defattr(-,root,root)
+%doc %{_docdir}/%{name}
 %config %{_sysconfdir}/systemd/system/systemd-firstboot.service
 %{_unitdir}
 %{_libexecdir}/MicroOS-firstboot
+%{_libexecdir}/python*
+%{_sbindir}/adjust-cloud-cfg
 

commit caasp-tools for openSUSE:Factory

2017-04-18 Thread root
Hello community,

here is the log from the commit of package caasp-tools for openSUSE:Factory 
checked in at 2017-04-18 13:48:35

Comparing /work/SRC/openSUSE:Factory/caasp-tools (Old)
 and  /work/SRC/openSUSE:Factory/.caasp-tools.new (New)


Package is "caasp-tools"

Tue Apr 18 13:48:35 2017 rev:1 rq:478457 version:0.13

Changes:

New Changes file:

--- /dev/null   2017-03-01 00:40:19.279048016 +0100
+++ /work/SRC/openSUSE:Factory/.caasp-tools.new/caasp-tools.changes 
2017-04-18 13:48:35.741778535 +0200
@@ -0,0 +1,93 @@
+---
+Thu Feb 16 18:07:35 CET 2017 - ku...@suse.de
+
+- Remove enabling services workaround
+
+---
+Mon Feb 13 14:02:48 CET 2017 - ku...@suse.de
+
+- Fix typo in spec file
+
+---
+Fri Feb 10 15:11:19 CET 2017 - ku...@suse.de
+
+- Add manual page for create_autoyast_profile
+- Add script to generate /etc/fstab.sys (mount overlayfs in initrd)
+
+---
+Wed Feb  1 18:02:31 CET 2017 - ku...@suse.de
+
+- Add workarounds to configure and enable salt-minion in autoyast
+  profile
+
+---
+Sun Jan 29 21:52:49 UTC 2017 - ku...@suse.de
+
+- Parse SUSEConnnect -s output for registration information
+
+---
+Sun Jan 29 13:51:20 CET 2017 - ku...@suse.de
+
+- Disable installer self update in autoyast profile
+
+---
+Fri Jan 20 21:19:39 CET 2017 - ku...@suse.de
+
+- Adjust for openSUSE support
+
+---
+Fri Jan 20 12:14:53 CET 2017 - ku...@suse.de
+
+- Replace autoyast profile with script to create it manual
+
+---
+Sat Jan 14 10:31:06 CET 2017 - ku...@suse.de
+
+- Add autoyast profile caasp.xml 
+
+---
+Sat Jan 14 10:28:02 CET 2017 - ku...@suse.de
+
+- Rename from casp to caasp
+
+---
+Mon Dec 19 15:28:28 CET 2016 - ku...@suse.de
+
+- Set "hostonly=''" for including overlay kernel module
+  [bnc#1016007]
+
+---
+Wed Dec 14 11:44:21 CET 2016 - ku...@suse.de
+
+- Replace hardcoded device with current root device
+
+---
+Tue Nov 22 17:24:04 CET 2016 - ku...@suse.de
+
+- Move cloud.cfg into own RPM
+
+---
+Mon Nov 21 19:24:44 CET 2016 - ku...@suse.de
+
+- Rename "stateless" to "overlay", which fits better from the name
+
+---
+Tue Nov 15 13:12:53 CET 2016 - ku...@suse.de
+
+- Move systemd presets to own package
+
+---
+Sun Nov 13 17:40:16 CET 2016 - ku...@suse.de
+
+- Update cloud.cfg
+
+---
+Sun Nov 13 10:55:45 CET 2016 - ku...@suse.de
+
+- Enable logrotate.timer per default
+
+---
+Mon Oct 24 15:02:01 CEST 2016 - ku...@suse.de
+
+- Initial version with new name
+

New:

  MicroOS-tools-0.13.tar.bz2
  caasp-tools.changes
  caasp-tools.spec
  create_autoyast_profile.pl



Other differences:
--
++ caasp-tools.spec ++
#
# spec file for package caasp-tools
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#


Name:   caasp-tools
Version:0.13
Release:0
Summary:Files and Scripts for SUSE CaaS Platform
License:GPL-2.0+
Group:  Development/Tools/Other
Source0:MicroOS-tools-%{version}.tar.bz2
Source1:create_autoyast_profile.pl
BuildRequires: