Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package habootstrap-formula for
openSUSE:Factory checked in at 2021-06-11 22:30:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/habootstrap-formula (Old)
and /work/SRC/openSUSE:Factory/.habootstrap-formula.new.32437 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "habootstrap-formula"
Fri Jun 11 22:30:49 2021 rev:23 rq:899440 version:0.4.2+git.1623406073.ac4a6b1
Changes:
--------
--- /work/SRC/openSUSE:Factory/habootstrap-formula/habootstrap-formula.changes
2021-06-04 00:34:22.733012176 +0200
+++
/work/SRC/openSUSE:Factory/.habootstrap-formula.new.32437/habootstrap-formula.changes
2021-06-11 22:31:28.234213023 +0200
@@ -4 +4,3 @@
-- Fix SUSE Manager integration
+- Version bump 0.4.2
+ * Fix SUSE Manager integration
+ * Move SUMA pillar data modifications to map.jinja file <xarb...@suse.com>
Old:
----
habootstrap-formula-0.4.1+git.1622731415.6c3fd47.tar.gz
New:
----
habootstrap-formula-0.4.2+git.1623406073.ac4a6b1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ habootstrap-formula.spec ++++++
--- /var/tmp/diff_new_pack.C078I2/_old 2021-06-11 22:31:28.614213682 +0200
+++ /var/tmp/diff_new_pack.C078I2/_new 2021-06-11 22:31:28.618213689 +0200
@@ -20,7 +20,7 @@
Name: habootstrap-formula
Group: System/Packages
-Version: 0.4.1+git.1622731415.6c3fd47
+Version: 0.4.2+git.1623406073.ac4a6b1
Release: 0
Summary: HA cluster (crmsh) deployment salt formula
++++++ _service ++++++
--- /var/tmp/diff_new_pack.C078I2/_old 2021-06-11 22:31:28.646213738 +0200
+++ /var/tmp/diff_new_pack.C078I2/_new 2021-06-11 22:31:28.646213738 +0200
@@ -4,8 +4,8 @@
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="filename">habootstrap-formula</param>
- <param name="versionformat">0.4.1+git.%ct.%h</param>
- <param name="revision">6c3fd4714301224d19a8bcbc81f690e05f0ea6bd</param>
+ <param name="versionformat">0.4.2+git.%ct.%h</param>
+ <param name="revision">ac4a6b14ba0965bc289b665d9df7ea6d85bb18b7</param>
</service>
<service name="recompress" mode="disabled">
++++++ habootstrap-formula-0.4.1+git.1622731415.6c3fd47.tar.gz ->
habootstrap-formula-0.4.2+git.1623406073.ac4a6b1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.1+git.1622731415.6c3fd47/_service
new/habootstrap-formula-0.4.2+git.1623406073.ac4a6b1/_service
--- old/habootstrap-formula-0.4.1+git.1622731415.6c3fd47/_service
2021-06-03 16:43:35.000000000 +0200
+++ new/habootstrap-formula-0.4.2+git.1623406073.ac4a6b1/_service
2021-06-11 12:07:53.000000000 +0200
@@ -4,7 +4,7 @@
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="filename">habootstrap-formula</param>
- <param name="versionformat">0.4.1+git.%ct.%h</param>
+ <param name="versionformat">0.4.2+git.%ct.%h</param>
<param name="revision">%%VERSION%%</param>
</service>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.1+git.1622731415.6c3fd47/cluster/init.sls
new/habootstrap-formula-0.4.2+git.1623406073.ac4a6b1/cluster/init.sls
--- old/habootstrap-formula-0.4.1+git.1622731415.6c3fd47/cluster/init.sls
2021-06-03 16:43:35.000000000 +0200
+++ new/habootstrap-formula-0.4.2+git.1623406073.ac4a6b1/cluster/init.sls
2021-06-11 12:07:53.000000000 +0200
@@ -2,7 +2,6 @@
{% set host = grains['host'] %}
include:
- - .pre_validation
- .cloud_detection
{% if cluster.install_packages is sameas true %}
- .packages
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.1+git.1622731415.6c3fd47/cluster/map.jinja
new/habootstrap-formula-0.4.2+git.1623406073.ac4a6b1/cluster/map.jinja
--- old/habootstrap-formula-0.4.1+git.1622731415.6c3fd47/cluster/map.jinja
2021-06-03 16:43:35.000000000 +0200
+++ new/habootstrap-formula-0.4.2+git.1623406073.ac4a6b1/cluster/map.jinja
2021-06-11 12:07:53.000000000 +0200
@@ -4,6 +4,37 @@
{% import_yaml "cluster/defaults.yaml" as defaults %}
{% set cluster = salt['pillar.get']('cluster', default=defaults.cluster,
merge=True) %}
-{% if not cluster.configure_checkbox|default(false) %}
- {% do cluster.pop('configure', none) %}
+# This next operations are only used in Suse Manager executions
+# Some of the elements (as configure_checkbox) are carried from the form.yml
+
+{% if cluster.configure_checkbox is defined %}
+ {% if cluster.configure_checkbox %}
+ {% if cluster.configure.configure_url_checkbox %}
+ {% do cluster.configure.pop('template', none) %}
+ {% else %}
+ {% do cluster.configure.pop('url', none) %}
+ {% if cluster.configure.template.parameters is defined and
cluster.configure.template.parameters|length > 0 %}
+ {% set new_parameters = {} %}
+ {% for new_item in cluster.configure.template.parameters %}
+ {% do new_parameters.update({new_item.key: new_item.value}) %}
+ {% endfor %}
+ {% do cluster.configure.template.update({'parameters':
new_parameters}) %}
+ {% endif %}
+ {% endif %}
+ {% else %}
+ {% do cluster.pop('configure', none) %}
+ {% endif %}
+{% endif %}
+
+{% if cluster.sbd_checkbox is defined %}
+ {% if cluster.sbd_checkbox %}
+ {% if cluster.sbd.diskless_checkbox|default(false) %}
+ {% do cluster.sbd.update({'device': false}) %}
+ {% endif %}
+ {% if not cluster.sbd.configure_sbd_checkbox|default(false) %}
+ {% do cluster.sbd.pop('configure_resource', none) %}
+ {% endif %}
+ {% else %}
+ {% do cluster.pop('sbd', none) %}
+ {% endif %}
{% endif %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.1+git.1622731415.6c3fd47/cluster/pre_validation.sls
new/habootstrap-formula-0.4.2+git.1623406073.ac4a6b1/cluster/pre_validation.sls
---
old/habootstrap-formula-0.4.1+git.1622731415.6c3fd47/cluster/pre_validation.sls
2021-06-03 16:43:35.000000000 +0200
+++
new/habootstrap-formula-0.4.2+git.1623406073.ac4a6b1/cluster/pre_validation.sls
1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-{% from "cluster/map.jinja" import cluster with context -%}
-
-{% if cluster.configure_checkbox|default(false) %}
- {% if cluster.configure.configure_url_checkbox|default(false) %}
- {% do cluster.configure.pop('template', none) %}
- {% else %}
- {% do cluster.configure.pop('url', none) %}
- {% if cluster.configure.template.parameters is defined and
cluster.configure.template.parameters|length > 0 %}
- {% set new_parameters = {} %}
- {% for new_item in cluster.configure.template.parameters %}
- {% do new_parameters.update({new_item.key: new_item.value}) %}
- {% endfor %}
- {% do cluster.configure.template.update({'parameters': new_parameters})
%}
- {% endif %}
- {% endif %}
-{% endif %}
-
-{% if cluster.sbd is defined and cluster.sbd_checkbox|default(false) %}
- {% if cluster.sbd.diskless_checkbox|default(false) %}
- {% do cluster.sbd.update({'device': false}) %}
- {% endif %}
- {% if not cluster.sbd.configure_sbd_checkbox|default(false) %}
- {% do cluster.sbd.pop('configure_resource', none) %}
- {% endif %}
-{% endif %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.1+git.1622731415.6c3fd47/habootstrap-formula.changes
new/habootstrap-formula-0.4.2+git.1623406073.ac4a6b1/habootstrap-formula.changes
---
old/habootstrap-formula-0.4.1+git.1622731415.6c3fd47/habootstrap-formula.changes
2021-06-03 16:43:35.000000000 +0200
+++
new/habootstrap-formula-0.4.2+git.1623406073.ac4a6b1/habootstrap-formula.changes
2021-06-11 12:07:53.000000000 +0200
@@ -1,7 +1,9 @@
-------------------------------------------------------------------
Thu Mar 11 15:03:24 UTC 2021 - C??dric Bosdonnat <cbosdon...@suse.com>
-- Fix SUSE Manager integration
+- Version bump 0.4.2
+ * Fix SUSE Manager integration
+ * Move SUMA pillar data modifications to map.jinja file <xarb...@suse.com>
(bsc#1181731)
-------------------------------------------------------------------
@@ -9,7 +11,7 @@
- Version bump 0.4.1
* Ass sshkeys to default dictionary to allow usage with this item
- (bsc#1181453)
+ (bsc#1181453)
-------------------------------------------------------------------
Wed Jan 20 08:28:05 UTC 2021 - Xabier Arbulu <xarb...@suse.com>
