Hello community,
here is the log from the commit of package habootstrap-formula for
openSUSE:Factory checked in at 2020-09-16 19:37:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/habootstrap-formula (Old)
and /work/SRC/openSUSE:Factory/.habootstrap-formula.new.4249 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "habootstrap-formula"
Wed Sep 16 19:37:48 2020 rev:13 rq:834757 version:0.3.8+git.1600211526.98835ed
Changes:
--------
--- /work/SRC/openSUSE:Factory/habootstrap-formula/habootstrap-formula.changes
2020-09-12 00:12:53.021235447 +0200
+++
/work/SRC/openSUSE:Factory/.habootstrap-formula.new.4249/habootstrap-formula.changes
2020-09-16 19:38:02.606711732 +0200
@@ -11,0 +12 @@
+ (bsc#1174994)
Old:
----
habootstrap-formula-0.3.8+git.1599825027.ca5817c.tar.gz
New:
----
habootstrap-formula-0.3.8+git.1600211526.98835ed.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ habootstrap-formula.spec ++++++
--- /var/tmp/diff_new_pack.g2qLBj/_old 2020-09-16 19:38:05.670715180 +0200
+++ /var/tmp/diff_new_pack.g2qLBj/_new 2020-09-16 19:38:05.674715184 +0200
@@ -20,7 +20,7 @@
Name: habootstrap-formula
Group: System/Packages
-Version: 0.3.8+git.1599825027.ca5817c
+Version: 0.3.8+git.1600211526.98835ed
Release: 0
Summary: HA cluster (crmsh) deployment salt formula
@@ -52,8 +52,7 @@
mkdir -p %{buildroot}%{fdir}/metadata/%{fname}
cp -R %{fname} %{buildroot}%{fdir}/states
cp -R %{ftemplates} %{buildroot}%{fdir}/states/%{fname}
-cp pillar.example %{buildroot}%{fdir}/states/%{fname}
-cp -R form.yml %{buildroot}%{fdir}/metadata/%{fname}
+cp -R form.yml pillar.example %{buildroot}%{fdir}/metadata/%{fname}
if [ -f metadata.yml ]
then
cp -R metadata.yml %{buildroot}%{fdir}/metadata/%{fname}
++++++ _service ++++++
--- /var/tmp/diff_new_pack.g2qLBj/_old 2020-09-16 19:38:05.702715215 +0200
+++ /var/tmp/diff_new_pack.g2qLBj/_new 2020-09-16 19:38:05.702715215 +0200
@@ -5,7 +5,7 @@
<param name="exclude">.git</param>
<param name="filename">habootstrap-formula</param>
<param name="versionformat">0.3.8+git.%ct.%h</param>
- <param name="revision">ca5817cc644143c838dd005d2a2edf46c0f976d1</param>
+ <param name="revision">98835edb190a11c5908d8c50a2eb31a0698bd5c5</param>
</service>
<service name="recompress" mode="disabled">
++++++ habootstrap-formula-0.3.8+git.1599825027.ca5817c.tar.gz ->
habootstrap-formula-0.3.8+git.1600211526.98835ed.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.3.8+git.1599825027.ca5817c/cluster/cloud_detection.sls
new/habootstrap-formula-0.3.8+git.1600211526.98835ed/cluster/cloud_detection.sls
---
old/habootstrap-formula-0.3.8+git.1599825027.ca5817c/cluster/cloud_detection.sls
2020-09-11 13:50:27.000000000 +0200
+++
new/habootstrap-formula-0.3.8+git.1600211526.98835ed/cluster/cloud_detection.sls
2020-09-16 01:12:06.000000000 +0200
@@ -1,8 +1,14 @@
-# crmsh must exist to run crm.detect_cloud
-{% do salt['pkg.install'](name='crmsh') %}
-{% do salt['grains.set']('cloud_provider', salt['crm.detect_cloud']()) %}
+install_crmsh:
+ pkg.installed:
+ - name: crmsh
+ - retry:
+ attempts: 3
+ interval: 15
-{% if grains['cloud_provider'] == 'google-cloud-platform' %}
-{% do salt['grains.set']('gcp_instance_id',
salt['http.query'](url='http://metadata.google.internal/computeMetadata/v1/instance/id',
header_dict={"Metadata-Flavor": "Google"})['body']) %}
-{% do salt['grains.set']('gcp_instance_name',
salt['http.query'](url='http://metadata.google.internal/computeMetadata/v1/instance/name',
header_dict={"Metadata-Flavor": "Google"})['body']) %}
-{% endif %}
+# This state will set the next grains are required by this formula and used
configuration templates
+# All providers: cloud_provider
+# Only gcp: gcp_instance_id, gcp_instance_name
+set_cloud_data_in_grains:
+ crm.cloud_grains_present:
+ - require:
+ - install_crmsh
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.3.8+git.1599825027.ca5817c/cluster/packages.sls
new/habootstrap-formula-0.3.8+git.1600211526.98835ed/cluster/packages.sls
--- old/habootstrap-formula-0.3.8+git.1599825027.ca5817c/cluster/packages.sls
2020-09-11 13:50:27.000000000 +0200
+++ new/habootstrap-formula-0.3.8+git.1600211526.98835ed/cluster/packages.sls
2020-09-16 01:12:06.000000000 +0200
@@ -26,7 +26,6 @@
interval: 15
- pkgs:
- corosync
- - crmsh
- csync2
- drbd
- drbd-utils
@@ -40,18 +39,21 @@
{% endif %}
-{% if grains['cloud_provider'] == 'microsoft-azure' %}
+# The next 2 onlyif statements can be improved when salt version 3000 is used
+# https://docs.saltstack.com/en/latest/ref/states/requisites.html#onlyif
install_additional_packages_azure:
pkg.installed:
+ - onlyif: cat /etc/salt/grains | grep "cloud_provider:.*microsoft-azure"
- retry:
attempts: 3
interval: 15
- pkgs:
- socat
-{% elif grains['cloud_provider'] == 'google-cloud-platform' %}
+
{%- set python_version = 'python' if grains['pythonversion'][0] == 2 else
'python3' %}
install_additional_packages_gcp:
pkg.installed:
+ - onlyif: cat /etc/salt/grains | grep
"cloud_provider:.*google-cloud-platform"
- retry:
attempts: 3
interval: 15
@@ -61,4 +63,3 @@
- {{ python_version }}-google-auth-httplib2
- {{ python_version }}-pyroute2 # Needed by gcp-vpc-move-route
- resolve_capabilities: true
-{% endif %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.3.8+git.1599825027.ca5817c/habootstrap-formula.changes
new/habootstrap-formula-0.3.8+git.1600211526.98835ed/habootstrap-formula.changes
---
old/habootstrap-formula-0.3.8+git.1599825027.ca5817c/habootstrap-formula.changes
2020-09-11 13:50:27.000000000 +0200
+++
new/habootstrap-formula-0.3.8+git.1600211526.98835ed/habootstrap-formula.changes
2020-09-16 01:12:06.000000000 +0200
@@ -9,6 +9,7 @@
- Version bump 0.3.8
* Include the pillar example file in package
+ (bsc#1174994)
-------------------------------------------------------------------
Thu Jun 4 08:56:32 UTC 2020 - Xabier Arbulu <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.3.8+git.1599825027.ca5817c/habootstrap-formula.spec
new/habootstrap-formula-0.3.8+git.1600211526.98835ed/habootstrap-formula.spec
---
old/habootstrap-formula-0.3.8+git.1599825027.ca5817c/habootstrap-formula.spec
2020-09-11 13:50:27.000000000 +0200
+++
new/habootstrap-formula-0.3.8+git.1600211526.98835ed/habootstrap-formula.spec
2020-09-16 01:12:06.000000000 +0200
@@ -52,8 +52,7 @@
mkdir -p %{buildroot}%{fdir}/metadata/%{fname}
cp -R %{fname} %{buildroot}%{fdir}/states
cp -R %{ftemplates} %{buildroot}%{fdir}/states/%{fname}
-cp pillar.example %{buildroot}%{fdir}/states/%{fname}
-cp -R form.yml %{buildroot}%{fdir}/metadata/%{fname}
+cp -R form.yml pillar.example %{buildroot}%{fdir}/metadata/%{fname}
if [ -f metadata.yml ]
then
cp -R metadata.yml %{buildroot}%{fdir}/metadata/%{fname}
