Hello community,
here is the log from the commit of package yomi-formula for openSUSE:Factory
checked in at 2020-04-07 10:23:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yomi-formula (Old)
and /work/SRC/openSUSE:Factory/.yomi-formula.new.3248 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yomi-formula"
Tue Apr 7 10:23:55 2020 rev:13 rq:791002 version:0.0.1+git.1585837779.87bbc9c
Changes:
--------
--- /work/SRC/openSUSE:Factory/yomi-formula/yomi-formula.changes
2020-03-31 17:32:12.608259251 +0200
+++ /work/SRC/openSUSE:Factory/.yomi-formula.new.3248/yomi-formula.changes
2020-04-07 10:24:01.090009044 +0200
@@ -1,0 +2,13 @@
+Thu Apr 02 17:23:32 UTC 2020 - Alberto Planas Dominguez <apla...@suse.com>
+
+- Update to version 0.0.1+git.1585837779.87bbc9c:
+ * salt-minion: transfer also the cached data
+
+-------------------------------------------------------------------
+Wed Apr 01 17:25:28 UTC 2020 - Alberto Planas Dominguez <apla...@suse.com>
+
+- Update to version 0.0.1+git.1585760395.c0ab5b9:
+ * network: reformat file.append text
+ * network: add systemd link for the NIC (bsc#1168076)
+
+-------------------------------------------------------------------
Old:
----
yomi-0.0.1+git.1585319502.392f59c.obscpio
New:
----
yomi-0.0.1+git.1585837779.87bbc9c.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yomi-formula.spec ++++++
--- /var/tmp/diff_new_pack.OHAdyV/_old 2020-04-07 10:24:01.738009764 +0200
+++ /var/tmp/diff_new_pack.OHAdyV/_new 2020-04-07 10:24:01.742009770 +0200
@@ -20,7 +20,7 @@
%define fdir %{_datadir}/salt-formulas
Name: yomi-formula
-Version: 0.0.1+git.1585319502.392f59c
+Version: 0.0.1+git.1585837779.87bbc9c
Release: 0
Summary: Yomi - Yet one more installer
License: Apache-2.0
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.OHAdyV/_old 2020-04-07 10:24:01.782009814 +0200
+++ /var/tmp/diff_new_pack.OHAdyV/_new 2020-04-07 10:24:01.782009814 +0200
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/openSUSE/yomi.git</param>
- <param
name="changesrevision">392f59cfaabe5a25aea39a38ed58a003dff68724</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">87bbc9cdee008bec812f699ffb151522206d2a02</param></service></servicedata>
\ No newline at end of file
++++++ yomi-0.0.1+git.1585319502.392f59c.obscpio ->
yomi-0.0.1+git.1585837779.87bbc9c.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yomi-0.0.1+git.1585319502.392f59c/README.md
new/yomi-0.0.1+git.1585837779.87bbc9c/README.md
--- old/yomi-0.0.1+git.1585319502.392f59c/README.md 2020-03-27
15:31:42.000000000 +0100
+++ new/yomi-0.0.1+git.1585837779.87bbc9c/README.md 2020-04-02
16:29:39.000000000 +0200
@@ -1215,7 +1215,9 @@
If `yes`, the configuration and cetificates of the new minion will
be the same that the current minion that is activated. This will
- copy the minion configuration, certificates and grains.
+ copy the minion configuration, certificates and grains, together
+ with the cached modules and states that are usually synchronized
+ before a highstate.
This option will be replaced in the future with more detailed ones.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yomi-0.0.1+git.1585319502.392f59c/salt/yomi/services/network.sls
new/yomi-0.0.1+git.1585837779.87bbc9c/salt/yomi/services/network.sls
--- old/yomi-0.0.1+git.1585319502.392f59c/salt/yomi/services/network.sls
2020-03-27 15:31:42.000000000 +0100
+++ new/yomi-0.0.1+git.1585837779.87bbc9c/salt/yomi/services/network.sls
2020-04-02 16:29:39.000000000 +0200
@@ -1,43 +1,68 @@
{% import 'macros.yml' as macros %}
-{% set interfaces = salt.network.interfaces() | select('!=', 'lo') %}
+{% set interfaces = salt.network.interfaces() %}
+{% set interfaces_except_lo = interfaces | select('!=', 'lo') %}
+
+{{ macros.log('file', 'create_systemd_network_directory') }}
+create_systemd_network_directory:
+ file.directory:
+ - name: /mnt/etc/systemd/network
+ - user: root
+ - group: root
+ - dir_mode: 755
+ - unless: "[ -e
/mnt/usr/lib/udev/rules.d/75-persistent-net-generator.rules ]"
# This assume that the image used for deployment is under a
# predictable network interface name, like Tumbleweed. For SLE, boot
# the image with `net.ifnames=1`
-{% for interface in interfaces %}
+{% for interface in interfaces_except_lo %}
{{ macros.log('file', 'create_ifcfg_' ~ interface) }}
create_ifcfg_{{ interface }}:
file.append:
- name: /mnt/etc/sysconfig/network/ifcfg-{{ interface }}
- - text:
- - BOOTPROTO='dhcp'
- - BROADCAST=''
- - ETHTOOL_OPTIONS=''
- - IPADDR=''
- - MTU=''
- - NAME=''
- - NETMASK=''
- - NETWORK=''
- - REMOTE_IPADDR=''
- - STARTMODE='auto'
+ - text: |
+ BOOTPROTO='dhcp'
+ BROADCAST=''
+ ETHTOOL_OPTIONS=''
+ IPADDR=''
+ MTU=''
+ NAME=''
+ NETMASK=''
+ NETWORK=''
+ REMOTE_IPADDR=''
+ STARTMODE='auto'
+ - unless: "[ -e
/mnt/usr/lib/udev/rules.d/75-persistent-net-generator.rules ]"
+
+# The predictable network interface name can be different depending on
+# the kernel / systemd version. One example can be bsc#1168076. To
+# avoid this we will create a systemd link.
+{{ macros.log('file', 'create_systemd_link_' ~ interface) }}
+create_systemd_link_{{ interface }}:
+ file.append:
+ - name: /mnt/etc/systemd/network/80-{{ interface }}.link
+ - text: |
+ [Match]
+ OriginalName=*
+ MACAddress={{ interfaces[interface]['hwaddr'] }}
+ [Link]
+ Name={{ interface }}
- unless: "[ -e
/mnt/usr/lib/udev/rules.d/75-persistent-net-generator.rules ]"
{{ macros.log('file', 'create_ifcfg_eth' ~ loop.index0) }}
create_ifcfg_eth{{ loop.index0 }}:
file.append:
- name: /mnt/etc/sysconfig/network/ifcfg-eth{{ loop.index0 }}
- - text:
- - BOOTPROTO='dhcp'
- - BROADCAST=''
- - ETHTOOL_OPTIONS=''
- - IPADDR=''
- - MTU=''
- - NAME=''
- - NETMASK=''
- - NETWORK=''
- - REMOTE_IPADDR=''
- - STARTMODE='auto'
+ - text: |
+ BOOTPROTO='dhcp'
+ BROADCAST=''
+ ETHTOOL_OPTIONS=''
+ IPADDR=''
+ MTU=''
+ NAME=''
+ NETMASK=''
+ NETWORK=''
+ REMOTE_IPADDR=''
+ STARTMODE='auto'
- onlyif: "[ -e
/mnt/usr/lib/udev/rules.d/75-persistent-net-generator.rules ]"
{% endfor %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yomi-0.0.1+git.1585319502.392f59c/salt/yomi/services/salt-minion/init.sls
new/yomi-0.0.1+git.1585837779.87bbc9c/salt/yomi/services/salt-minion/init.sls
---
old/yomi-0.0.1+git.1585319502.392f59c/salt/yomi/services/salt-minion/init.sls
2020-03-27 15:31:42.000000000 +0100
+++
new/yomi-0.0.1+git.1585837779.87bbc9c/salt/yomi/services/salt-minion/init.sls
2020-04-02 16:29:39.000000000 +0200
@@ -3,8 +3,8 @@
{% set salt_minion = pillar['salt-minion'] %}
{% if salt_minion.get('config') %}
-{{ macros.log('module', 'create_salt-minion') }}
-create_salt-minion:
+{{ macros.log('module', 'synchronize_salt-minion_etc') }}
+synchronize_salt-minion_etc:
module.run:
- file.copy:
- src: /etc/salt
@@ -12,4 +12,22 @@
- recurse: yes
- remove_existing: yes
- unless: "[ -e /mnt/etc/salt/pki/minion/minion.pem ]"
+
+{{ macros.log('module', 'synchronize_salt-minion_var') }}
+synchronize_salt-minion_var:
+ module.run:
+ - file.copy:
+ - src: /var/cache/salt
+ - dst: /mnt/var/cache/salt
+ - recurse: yes
+ - remove_existing: yes
+ - unless: "[ -e /mnt/var/cache/salt/minion/extmods ]"
+
+{{ macros.log('module', 'clean_salt-minion_var') }}
+clean_salt-minion_var:
+ file.tidied:
+ - name: /mnt/var/cache/salt/minion
+ - matches:
+ - ".*\\.pyc"
+ - "\\d+"
{% endif %}
++++++ yomi.obsinfo ++++++
--- /var/tmp/diff_new_pack.OHAdyV/_old 2020-04-07 10:24:01.958010009 +0200
+++ /var/tmp/diff_new_pack.OHAdyV/_new 2020-04-07 10:24:01.958010009 +0200
@@ -1,5 +1,5 @@
name: yomi
-version: 0.0.1+git.1585319502.392f59c
-mtime: 1585319502
-commit: 392f59cfaabe5a25aea39a38ed58a003dff68724
+version: 0.0.1+git.1585837779.87bbc9c
+mtime: 1585837779
+commit: 87bbc9cdee008bec812f699ffb151522206d2a02
