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 - [email protected] + +- 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 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/kubic-project/microos-tools.git</param> - <param name="changesrevision">c28b2148abaaf0db588a0bf273d87bc1dd916374</param> + <param name="changesrevision">9e72dd715157ffd9019b4d80e973218144accca8</param> </service> </servicedata> \ 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.000000000 +0100 +++ new/microos-tools-1.0+git20190218.9e72dd7/caasp/etc/salt/minion.d/grains_refresh.conf 2019-02-18 12:42:23.000000000 +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.000000000 +0100 +++ new/microos-tools-1.0+git20190218.9e72dd7/caasp/usr/lib/systemd/system/adjust-cloud-cfg.service 2019-02-18 12:42:23.000000000 +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' '--exclude=.svn' '--exclude=.svnignore' old/microos-tools-1.0+git20181212.c28b214/caasp/usr/lib/systemd/system/setup-salt-minion.service new/microos-tools-1.0+git20190218.9e72dd7/caasp/usr/lib/systemd/system/setup-salt-minion.service --- old/microos-tools-1.0+git20181212.c28b214/caasp/usr/lib/systemd/system/setup-salt-minion.service 1970-01-01 01:00:00.000000000 +0100 +++ new/microos-tools-1.0+git20190218.9e72dd7/caasp/usr/lib/systemd/system/setup-salt-minion.service 2019-02-18 12:42:23.000000000 +0100 @@ -0,0 +1,18 @@ +[Unit] +Description=Setup SALT minion ID +DefaultDependencies=no +Conflicts=shutdown.target +After=local-fs.target +Before=salt-minion.service +ConditionPathExists=/etc/machine-id +ConditionPathExists=/etc/salt/minion.d +ConditionPathExists=!/etc/salt/minion.d/minion_id.conf + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=-/bin/sh -c "echo -n 'id: ' > /etc/salt/minion.d/minion_id.conf; cat /etc/machine-id >> /etc/salt/minion.d/minion_id.conf" + +[Install] +WantedBy=multi-user.target + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/microos-tools-1.0+git20181212.c28b214/caasp/usr/sbin/adjust-cloud-cfg new/microos-tools-1.0+git20190218.9e72dd7/caasp/usr/sbin/adjust-cloud-cfg --- old/microos-tools-1.0+git20181212.c28b214/caasp/usr/sbin/adjust-cloud-cfg 1970-01-01 01:00:00.000000000 +0100 +++ new/microos-tools-1.0+git20190218.9e72dd7/caasp/usr/sbin/adjust-cloud-cfg 2019-02-18 12:42:23.000000000 +0100 @@ -0,0 +1,21 @@ +#!/bin/bash + +# go through the list of network devices. If we have for one a +# configuration file, tell cloud-init to not configure the network. + +CFG=/etc/cloud/cloud.cfg.d/01-network.cfg + +test -f ${CFG} && exit 0 + +for dev in `/sbin/ip -o link show | awk -F': ' '{print $2}'` ; do + if [ "${dev}" != "lo" ]; then + if [ -f /etc/sysconfig/network/ifcfg-${dev} ]; then + echo "network: {config: disabled}" > ${CFG} + exit 0 + fi + fi +done +# if we end here, there was no network configuration, so cloud-init +# will do the job. +touch ${CFG} +exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/microos-tools-1.0+git20181212.c28b214/caasp/usr/sbin/migrate-ntp2chrony new/microos-tools-1.0+git20190218.9e72dd7/caasp/usr/sbin/migrate-ntp2chrony --- old/microos-tools-1.0+git20181212.c28b214/caasp/usr/sbin/migrate-ntp2chrony 1970-01-01 01:00:00.000000000 +0100 +++ new/microos-tools-1.0+git20190218.9e72dd7/caasp/usr/sbin/migrate-ntp2chrony 2019-02-18 12:42:23.000000000 +0100 @@ -0,0 +1,32 @@ +#!/bin/bash + +BACKUPDIR=/var/lib/ntp2chrony/backup +LOGFILE=/var/log/migrate-ntp2chrony.log + +# if this directory exist, we did already migrate +test -d ${BACKUPDIR} && exit 0 + +# if ntp is not installed, exit +rpm -q --quiet ntp || exit 0 + +# if chrony is not installed, exit +rpm -q --quiet chrony || exit 0 + +# ntpd is not enabled, exit +systemctl is-enabled -q ntpd || exit 0 + +# ntpd is enabled, chrony installed. Backup +# configuration, convert configuration, disable +# ntpd, enable chrony, but do not restart. +mkdir -p ${BACKUPDIR} || exit 1 +cp -a /etc/ntp.* ${BACKUPDIR}/ +cp -a /etc/chrony.* ${BACKUPDIR}/ +echo "Migrate /etc/ntp.conf to /etc/chrony.conf (`date \"+%Y-%m-%d %H:%M:%S\"`)" | tee -a ${LOGFILE} +echo "Ignored lines:" | tee -a ${LOGFILE} +/usr/sbin/ntp2chrony --backup --ignored-lines |& tee -a ${LOGFILE} +if [ ${PIPESTATUS[0]} -ne 0 ]; then + exit 1 +fi +systemctl disable ntpd |& tee -a ${LOGFILE} +systemctl enable chronyd |& tee -a ${LOGFILE} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/microos-tools-1.0+git20181212.c28b214/etc/salt/minion.d/grains_refresh.conf new/microos-tools-1.0+git20190218.9e72dd7/etc/salt/minion.d/grains_refresh.conf --- old/microos-tools-1.0+git20181212.c28b214/etc/salt/minion.d/grains_refresh.conf 2018-12-12 15:02:49.000000000 +0100 +++ new/microos-tools-1.0+git20190218.9e72dd7/etc/salt/minion.d/grains_refresh.conf 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -grains_refresh_every: 10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/microos-tools-1.0+git20181212.c28b214/usr/lib/sysctl.d/51-corefiles.conf new/microos-tools-1.0+git20190218.9e72dd7/usr/lib/sysctl.d/51-corefiles.conf --- old/microos-tools-1.0+git20181212.c28b214/usr/lib/sysctl.d/51-corefiles.conf 2018-12-12 15:02:49.000000000 +0100 +++ new/microos-tools-1.0+git20190218.9e72dd7/usr/lib/sysctl.d/51-corefiles.conf 2019-02-18 12:42:23.000000000 +0100 @@ -7,4 +7,4 @@ # %t: UNIX time of dump # %h: hostname # %e: executable filename -kernel.core_pattern=/tmp/core.%h.%e.%p.%t +kernel.core_pattern=/var/tmp/core.%h.%e.%p.%t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/microos-tools-1.0+git20181212.c28b214/usr/lib/systemd/system/adjust-cloud-cfg.service new/microos-tools-1.0+git20190218.9e72dd7/usr/lib/systemd/system/adjust-cloud-cfg.service --- old/microos-tools-1.0+git20181212.c28b214/usr/lib/systemd/system/adjust-cloud-cfg.service 2018-12-12 15:02:49.000000000 +0100 +++ new/microos-tools-1.0+git20190218.9e72dd7/usr/lib/systemd/system/adjust-cloud-cfg.service 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -[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' '--exclude=.svn' '--exclude=.svnignore' old/microos-tools-1.0+git20181212.c28b214/usr/lib/systemd/system/printenv.service new/microos-tools-1.0+git20190218.9e72dd7/usr/lib/systemd/system/printenv.service --- old/microos-tools-1.0+git20181212.c28b214/usr/lib/systemd/system/printenv.service 1970-01-01 01:00:00.000000000 +0100 +++ new/microos-tools-1.0+git20190218.9e72dd7/usr/lib/systemd/system/printenv.service 2019-02-18 12:42:23.000000000 +0100 @@ -0,0 +1,11 @@ +[Unit] +Description=Print systemd environment +Wants=local-fs.target + +[Service] +Type=oneshot +ExecStart=/usr/bin/printenv + +[Install] +WantedBy=default.target + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/microos-tools-1.0+git20181212.c28b214/usr/lib/systemd/system/setup-salt-minion.service new/microos-tools-1.0+git20190218.9e72dd7/usr/lib/systemd/system/setup-salt-minion.service --- old/microos-tools-1.0+git20181212.c28b214/usr/lib/systemd/system/setup-salt-minion.service 2018-12-12 15:02:49.000000000 +0100 +++ new/microos-tools-1.0+git20190218.9e72dd7/usr/lib/systemd/system/setup-salt-minion.service 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -[Unit] -Description=Setup SALT minion ID -DefaultDependencies=no -Conflicts=shutdown.target -After=local-fs.target -Before=salt-minion.service -ConditionPathExists=/etc/machine-id -ConditionPathExists=/etc/salt/minion.d -ConditionPathExists=!/etc/salt/minion.d/minion_id.conf - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=-/bin/sh -c "echo -n 'id: ' > /etc/salt/minion.d/minion_id.conf; cat /etc/machine-id >> /etc/salt/minion.d/minion_id.conf" - -[Install] -WantedBy=multi-user.target - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/microos-tools-1.0+git20181212.c28b214/usr/sbin/adjust-cloud-cfg new/microos-tools-1.0+git20190218.9e72dd7/usr/sbin/adjust-cloud-cfg --- old/microos-tools-1.0+git20181212.c28b214/usr/sbin/adjust-cloud-cfg 2018-12-12 15:02:49.000000000 +0100 +++ new/microos-tools-1.0+git20190218.9e72dd7/usr/sbin/adjust-cloud-cfg 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -#!/bin/bash - -# go through the list of network devices. If we have for one a -# configuration file, tell cloud-init to not configure the network. - -CFG=/etc/cloud/cloud.cfg.d/01-network.cfg - -test -f ${CFG} && exit 0 - -for dev in `/sbin/ip -o link show | awk -F': ' '{print $2}'` ; do - if [ "${dev}" != "lo" ]; then - if [ -f /etc/sysconfig/network/ifcfg-${dev} ]; then - echo "network: {config: disabled}" > ${CFG} - exit 0 - fi - fi -done -# if we end here, there was no network configuration, so cloud-init -# will do the job. -touch ${CFG} -exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/microos-tools-1.0+git20181212.c28b214/usr/sbin/migrate-ntp2chrony new/microos-tools-1.0+git20190218.9e72dd7/usr/sbin/migrate-ntp2chrony --- old/microos-tools-1.0+git20181212.c28b214/usr/sbin/migrate-ntp2chrony 2018-12-12 15:02:49.000000000 +0100 +++ new/microos-tools-1.0+git20190218.9e72dd7/usr/sbin/migrate-ntp2chrony 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -#!/bin/bash - -BACKUPDIR=/var/lib/ntp2chrony/backup -LOGFILE=/var/log/migrate-ntp2chrony.log - -# if this directory exist, we did already migrate -test -d ${BACKUPDIR} && exit 0 - -# if ntp is not installed, exit -rpm -q --quiet ntp || exit 0 - -# if chrony is not installed, exit -rpm -q --quiet chrony || exit 0 - -# ntpd is not enabled, exit -systemctl is-enabled -q ntpd || exit 0 - -# ntpd is enabled, chrony installed. Backup -# configuration, convert configuration, disable -# ntpd, enable chrony, but do not restart. -mkdir -p ${BACKUPDIR} || exit 1 -cp -a /etc/ntp.* ${BACKUPDIR}/ -cp -a /etc/chrony.* ${BACKUPDIR}/ -echo "Migrate /etc/ntp.conf to /etc/chrony.conf (`date \"+%Y-%m-%d %H:%M:%S\"`)" | tee -a ${LOGFILE} -echo "Ignored lines:" | tee -a ${LOGFILE} -/usr/sbin/ntp2chrony --backup --ignored-lines |& tee -a ${LOGFILE} -if [ ${PIPESTATUS[0]} -ne 0 ]; then - exit 1 -fi -systemctl disable ntpd |& tee -a ${LOGFILE} -systemctl enable chronyd |& tee -a ${LOGFILE} -
