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-01-21 21:56:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/habootstrap-formula (Old)
and /work/SRC/openSUSE:Factory/.habootstrap-formula.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "habootstrap-formula"
Thu Jan 21 21:56:55 2021 rev:20 rq:865251 version:0.4.0+git.1611213679.df6b3fb
Changes:
--------
--- /work/SRC/openSUSE:Factory/habootstrap-formula/habootstrap-formula.changes
2021-01-20 18:27:25.791518032 +0100
+++
/work/SRC/openSUSE:Factory/.habootstrap-formula.new.28504/habootstrap-formula.changes
2021-01-21 21:57:00.753849802 +0100
@@ -2 +2 @@
-Tue Jan 19 09:38:52 UTC 2021 - Xabier Arbulu <[email protected]>
+Wed Jan 20 08:28:05 UTC 2021 - Xabier Arbulu <[email protected]>
@@ -7,0 +8,7 @@
+
+-------------------------------------------------------------------
+Tue Jan 19 09:38:52 UTC 2021 - Xabier Arbulu <[email protected]>
+
+- Remove lock states as this is done in crmsh now
+- Fix ssh keys management to run them once the first node is
+ initialized
Old:
----
habootstrap-formula-0.4.0+git.1611071659.c94de02.tar.gz
New:
----
habootstrap-formula-0.4.0+git.1611213679.df6b3fb.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ habootstrap-formula.spec ++++++
--- /var/tmp/diff_new_pack.Iy48rK/_old 2021-01-21 21:57:01.181849948 +0100
+++ /var/tmp/diff_new_pack.Iy48rK/_new 2021-01-21 21:57:01.185849949 +0100
@@ -20,7 +20,7 @@
Name: habootstrap-formula
Group: System/Packages
-Version: 0.4.0+git.1611071659.c94de02
+Version: 0.4.0+git.1611213679.df6b3fb
Release: 0
Summary: HA cluster (crmsh) deployment salt formula
++++++ _service ++++++
--- /var/tmp/diff_new_pack.Iy48rK/_old 2021-01-21 21:57:01.209849957 +0100
+++ /var/tmp/diff_new_pack.Iy48rK/_new 2021-01-21 21:57:01.209849957 +0100
@@ -5,7 +5,7 @@
<param name="exclude">.git</param>
<param name="filename">habootstrap-formula</param>
<param name="versionformat">0.4.0+git.%ct.%h</param>
- <param name="revision">c94de022e0883fc738a3c0d4bd8d1f25be065990</param>
+ <param name="revision">df6b3fb0e244092a0e78f323698057866554ce34</param>
</service>
<service name="recompress" mode="disabled">
++++++ habootstrap-formula-0.4.0+git.1611071659.c94de02.tar.gz ->
habootstrap-formula-0.4.0+git.1611213679.df6b3fb.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.0+git.1611071659.c94de02/.travis.yml
new/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/.travis.yml
--- old/habootstrap-formula-0.4.0+git.1611071659.c94de02/.travis.yml
2021-01-19 16:54:19.000000000 +0100
+++ new/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/.travis.yml
2021-01-21 08:21:19.000000000 +0100
@@ -2,11 +2,12 @@
services:
- docker
+dist: bionic
addons:
apt:
sources:
- - sourceline: 'deb
http://repo.saltstack.com/apt/ubuntu/18.04/amd64/2019.2/ bionic main'
- key_url:
'http://repo.saltstack.com/apt/ubuntu/18.04/amd64/2019.2/SALTSTACK-GPG-KEY.pub'
+ - sourceline: 'deb
http://repo.saltstack.com/apt/ubuntu/18.04/amd64/3000/ bionic main'
+ key_url:
'http://repo.saltstack.com/apt/ubuntu/18.04/amd64/3000/SALTSTACK-GPG-KEY.pub'
packages:
- salt-common
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.0+git.1611071659.c94de02/cluster/init.sls
new/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/cluster/init.sls
--- old/habootstrap-formula-0.4.0+git.1611071659.c94de02/cluster/init.sls
2021-01-19 16:54:19.000000000 +0100
+++ new/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/cluster/init.sls
2021-01-21 08:21:19.000000000 +0100
@@ -11,7 +11,6 @@
{% if cluster.ntp is defined %}
- .ntp
{% endif %}
- - .sshkeys
{% if cluster.watchdog is defined %}
{% if cluster.watchdog.module is defined %}
- .watchdog
@@ -22,6 +21,8 @@
{% elif host in cluster.remove %}
- .remove
{% else %}
+ - .wait_cluster
+ - .sshkeys
- .join
{% endif %}
{% if cluster.corosync is defined %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.0+git.1611071659.c94de02/cluster/join.sls
new/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/cluster/join.sls
--- old/habootstrap-formula-0.4.0+git.1611071659.c94de02/cluster/join.sls
2021-01-19 16:54:19.000000000 +0100
+++ new/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/cluster/join.sls
2021-01-21 08:21:19.000000000 +0100
@@ -1,36 +1,11 @@
{%- from "cluster/map.jinja" import cluster with context -%}
-{% set lock_dir = '/var/tmp/habootstrap_join.lock' %}
-
-wait-for-cluster:
- http.wait_for_successful_query:
- - name: 'https://{{ cluster.init }}:7630/monitor?0'
- - request_interval: 5
- - status: 200
- - verify_ssl: false
- - wait_for: {{ cluster.join_timeout }}
-
-wait-for-total-initialization:
- cmd.run:
- - name: 'sleep {{ cluster.wait_for_initialization }}'
- - require:
- - wait-for-cluster
-
check-ssh-connection-availability:
cmd.run:
- name: ssh -o StrictHostKeyChecking=no -o EscapeChar=none -o
ConnectTimeout=15 -T -o Batchmode=yes {{ cluster.init }} true
- require:
- wait-for-total-initialization
-acquire-lock-cluster:
- cmd.run:
- - name: until ssh -T root@{{ cluster.init }} -o StrictHostKeyChecking=no
'mkdir {{ lock_dir }}';do sleep 10;done
- - timeout: {{ cluster.join_timeout }}
- - output_loglevel: quiet
- - hide_output: True
- - require:
- - check-ssh-connection-availability
-
join-the-cluster:
crm.cluster_joined:
- name: {{ cluster.init }}
@@ -43,13 +18,7 @@
- interface: {{ cluster.interface }}
{% endif %}
- require:
- - acquire-lock-cluster
-
-release-lock-cluster:
- cmd.run:
- - name: ssh -T root@{{ cluster.init }} -o StrictHostKeyChecking=no 'rm -rf
{{ lock_dir }}'
- - require:
- - acquire-lock-cluster
+ - check-ssh-connection-availability
hawk:
service.running:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.0+git.1611071659.c94de02/cluster/sshkeys.sls
new/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/cluster/sshkeys.sls
--- old/habootstrap-formula-0.4.0+git.1611071659.c94de02/cluster/sshkeys.sls
2021-01-19 16:54:19.000000000 +0100
+++ new/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/cluster/sshkeys.sls
2021-01-21 08:21:19.000000000 +0100
@@ -7,12 +7,19 @@
- user: root
- group: root
- mode: 600
-
-{% if cluster.init != host %}
+ - require:
+ - wait-for-total-initialization
{% if cluster.sshkeys.get('password', False) %}
{% set password = cluster.sshkeys.get('password') %}
+create_key:
+ cmd.run:
+ - name: yes y | sudo ssh-keygen -f /root/.ssh/id_rsa -C 'Cluster Internal
on {{ grains['host'] }}' -N ''
+ - unless: 'test -e /root/.ssh/id_rsa'
+ - require:
+ - wait-for-total-initialization
+
copy_ask_pass:
file.managed:
- name: /tmp/ssh_askpass
@@ -20,6 +27,8 @@
- user: root
- group: root
- mode: 755
+ - require:
+ - wait-for-total-initialization
copy_ssh_pub:
cmd.run:
@@ -57,4 +66,3 @@
- copy_ssh_pub
{% endif %}
-{% endif %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.0+git.1611071659.c94de02/cluster/wait_cluster.sls
new/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/cluster/wait_cluster.sls
---
old/habootstrap-formula-0.4.0+git.1611071659.c94de02/cluster/wait_cluster.sls
1970-01-01 01:00:00.000000000 +0100
+++
new/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/cluster/wait_cluster.sls
2021-01-21 08:21:19.000000000 +0100
@@ -0,0 +1,15 @@
+{%- from "cluster/map.jinja" import cluster with context -%}
+
+wait-for-cluster:
+ http.wait_for_successful_query:
+ - name: 'https://{{ cluster.init }}:7630/monitor?0'
+ - request_interval: 5
+ - status: 200
+ - verify_ssl: false
+ - wait_for: {{ cluster.join_timeout }}
+
+wait-for-total-initialization:
+ cmd.run:
+ - name: 'sleep {{ cluster.wait_for_initialization }}'
+ - require:
+ - wait-for-cluster
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.0+git.1611071659.c94de02/habootstrap-formula.changes
new/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/habootstrap-formula.changes
---
old/habootstrap-formula-0.4.0+git.1611071659.c94de02/habootstrap-formula.changes
2021-01-19 16:54:19.000000000 +0100
+++
new/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/habootstrap-formula.changes
2021-01-21 08:21:19.000000000 +0100
@@ -1,5 +1,5 @@
-------------------------------------------------------------------
-Tue Jan 19 09:38:52 UTC 2021 - Xabier Arbulu <[email protected]>
+Wed Jan 20 08:28:05 UTC 2021 - Xabier Arbulu <[email protected]>
- Version bump 0.4.0
* Change salt-formulas-configuration requirement in SLE12 codestream
@@ -7,6 +7,13 @@
(bsc#1177860)
-------------------------------------------------------------------
+Tue Jan 19 09:38:52 UTC 2021 - Xabier Arbulu <[email protected]>
+
+- Remove lock states as this is done in crmsh now
+- Fix ssh keys management to run them once the first node is
+ initialized
+
+-------------------------------------------------------------------
Tue Jan 19 08:32:50 UTC 2021 - Aleksei Burlakov <[email protected]>
- Remove --no-overwrite-sshkey option from the formula
