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-19 16:02:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/habootstrap-formula (Old)
and /work/SRC/openSUSE:Factory/.habootstrap-formula.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "habootstrap-formula"
Tue Jan 19 16:02:24 2021 rev:18 rq:864243 version:0.3.11+git.1611046122.d1bd8e6
Changes:
--------
--- /work/SRC/openSUSE:Factory/habootstrap-formula/habootstrap-formula.changes
2020-10-16 16:16:42.768735473 +0200
+++
/work/SRC/openSUSE:Factory/.habootstrap-formula.new.28504/habootstrap-formula.changes
2021-01-19 16:02:50.855439207 +0100
@@ -1,0 +2,10 @@
+Tue Jan 19 08:32:50 UTC 2021 - Aleksei Burlakov <aburla...@suse.com>
+
+- Remove --no-overwrite-sshkey option from the formula
+
+-------------------------------------------------------------------
+Mon Jan 18 15:20:34 UTC 2021 - Aleksei Burlakov <aburla...@suse.com>
+
+- qdevice support: it can be created when initializing a cluster
+
+-------------------------------------------------------------------
Old:
----
habootstrap-formula-0.3.11+git.1602831614.0f63599.tar.gz
New:
----
habootstrap-formula-0.3.11+git.1611046122.d1bd8e6.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ habootstrap-formula.spec ++++++
--- /var/tmp/diff_new_pack.4xu9Ry/_old 2021-01-19 16:02:51.491440168 +0100
+++ /var/tmp/diff_new_pack.4xu9Ry/_new 2021-01-19 16:02:51.499440181 +0100
@@ -20,7 +20,7 @@
Name: habootstrap-formula
Group: System/Packages
-Version: 0.3.11+git.1602831614.0f63599
+Version: 0.3.11+git.1611046122.d1bd8e6
Release: 0
Summary: HA cluster (crmsh) deployment salt formula
++++++ _service ++++++
--- /var/tmp/diff_new_pack.4xu9Ry/_old 2021-01-19 16:02:51.547440253 +0100
+++ /var/tmp/diff_new_pack.4xu9Ry/_new 2021-01-19 16:02:51.551440259 +0100
@@ -5,7 +5,7 @@
<param name="exclude">.git</param>
<param name="filename">habootstrap-formula</param>
<param name="versionformat">0.3.11+git.%ct.%h</param>
- <param name="revision">0f63599fd2548b24e3cbba7d0a18d442d3000f8c</param>
+ <param name="revision">d1bd8e6be25d571267de914346337c7fbb243a43</param>
</service>
<service name="recompress" mode="disabled">
++++++ habootstrap-formula-0.3.11+git.1602831614.0f63599.tar.gz ->
habootstrap-formula-0.3.11+git.1611046122.d1bd8e6.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.3.11+git.1602831614.0f63599/ci/validate-formula.sh
new/habootstrap-formula-0.3.11+git.1611046122.d1bd8e6/ci/validate-formula.sh
---
old/habootstrap-formula-0.3.11+git.1602831614.0f63599/ci/validate-formula.sh
2020-10-16 09:00:14.000000000 +0200
+++
new/habootstrap-formula-0.3.11+git.1611046122.d1bd8e6/ci/validate-formula.sh
2021-01-19 09:48:42.000000000 +0100
@@ -19,7 +19,6 @@
device: '/dev/vdc'
ntp: pool.ntp.org
sshkeys:
- overwrite: true
password: linux
resource_agents:
- SAPHanaSR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.3.11+git.1602831614.0f63599/cluster/create.sls
new/habootstrap-formula-0.3.11+git.1611046122.d1bd8e6/cluster/create.sls
--- old/habootstrap-formula-0.3.11+git.1602831614.0f63599/cluster/create.sls
2020-10-16 09:00:14.000000000 +0200
+++ new/habootstrap-formula-0.3.11+git.1611046122.d1bd8e6/cluster/create.sls
2021-01-19 09:48:42.000000000 +0100
@@ -24,7 +24,11 @@
- sbd_dev: {{ cluster.sbd.device|json }}
{% endif %}
{% endif %}
- - no_overwrite_sshkey: {{ not cluster.sshkeys.overwrite }}
+ {% if cluster.qdevice is defined %}
+ {% if cluster.qdevice.qnetd_hostname is defined %}
+ - qnetd_hostname: {{ cluster.qdevice.qnetd_hostname }}
+ {% endif %}
+ {% endif %}
hawk:
service.running:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.3.11+git.1602831614.0f63599/cluster/defaults.yaml
new/habootstrap-formula-0.3.11+git.1611046122.d1bd8e6/cluster/defaults.yaml
--- old/habootstrap-formula-0.3.11+git.1602831614.0f63599/cluster/defaults.yaml
2020-10-16 09:00:14.000000000 +0200
+++ new/habootstrap-formula-0.3.11+git.1611046122.d1bd8e6/cluster/defaults.yaml
2021-01-19 09:48:42.000000000 +0100
@@ -3,7 +3,5 @@
install_packages: true
join_timeout: 60
wait_for_initialization: 20
- sshkeys:
- overwrite: false
remove: []
monitoring_enabled: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.3.11+git.1602831614.0f63599/cluster/packages.sls
new/habootstrap-formula-0.3.11+git.1611046122.d1bd8e6/cluster/packages.sls
--- old/habootstrap-formula-0.3.11+git.1602831614.0f63599/cluster/packages.sls
2020-10-16 09:00:14.000000000 +0200
+++ new/habootstrap-formula-0.3.11+git.1611046122.d1bd8e6/cluster/packages.sls
2021-01-19 09:48:42.000000000 +0100
@@ -39,6 +39,18 @@
{% endif %}
+{% if cluster.qdevice is defined %}
+{% if cluster.qdevice.qnetd_hostname is defined %}
+install_qdevice:
+ pkg.installed:
+ - retry:
+ attempts: 3
+ interval: 15
+ - pkgs:
+ - corosync-qdevice
+{% endif %}
+{% endif %}
+
# 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:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.3.11+git.1602831614.0f63599/cluster/sshkeys.sls
new/habootstrap-formula-0.3.11+git.1611046122.d1bd8e6/cluster/sshkeys.sls
--- old/habootstrap-formula-0.3.11+git.1602831614.0f63599/cluster/sshkeys.sls
2020-10-16 09:00:14.000000000 +0200
+++ new/habootstrap-formula-0.3.11+git.1611046122.d1bd8e6/cluster/sshkeys.sls
2021-01-19 09:48:42.000000000 +0100
@@ -13,13 +13,6 @@
{% if cluster.sshkeys.get('password', False) %}
{% set password = cluster.sshkeys.get('password') %}
-# Create a temporary key to provide access for the joining node to the 1st node
-{% if cluster.sshkeys.overwrite is sameas true %}
-create_key:
- cmd.run:
- - name: yes y | sudo ssh-keygen -f /root/.ssh/id_rsa -C 'Cluster key' -N ''
-{% endif %}
-
copy_ask_pass:
file.managed:
- name: /tmp/ssh_askpass
@@ -65,14 +58,3 @@
{% endif %}
{% endif %}
-
-# ssh keys must always exist if overwrite is false or if the node is joining
-{% if cluster.sshkeys.overwrite is sameas false or cluster.init != host %}
-check_sshkey_exists:
- file.exists:
- - name: /root/.ssh/id_rsa
-
-check_sshkey_pub_exists:
- file.exists:
- - name: /root/.ssh/id_rsa.pub
-{% endif %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.3.11+git.1602831614.0f63599/form.yml
new/habootstrap-formula-0.3.11+git.1611046122.d1bd8e6/form.yml
--- old/habootstrap-formula-0.3.11+git.1602831614.0f63599/form.yml
2020-10-16 09:00:14.000000000 +0200
+++ new/habootstrap-formula-0.3.11+git.1611046122.d1bd8e6/form.yml
2021-01-19 09:48:42.000000000 +0100
@@ -215,12 +215,6 @@
$type: boolean
$default: false
$optional: true
- overwrite:
- $visibleIf: .authorize_keys == true
- $name: Overwrite current keys
- $type: boolean
- $default: false
- $optional: true
password:
$visibleIf: .authorize_keys == true
$name: First node root password
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.3.11+git.1602831614.0f63599/habootstrap-formula.changes
new/habootstrap-formula-0.3.11+git.1611046122.d1bd8e6/habootstrap-formula.changes
---
old/habootstrap-formula-0.3.11+git.1602831614.0f63599/habootstrap-formula.changes
2020-10-16 09:00:14.000000000 +0200
+++
new/habootstrap-formula-0.3.11+git.1611046122.d1bd8e6/habootstrap-formula.changes
2021-01-19 09:48:42.000000000 +0100
@@ -1,4 +1,14 @@
-------------------------------------------------------------------
+Tue Jan 19 08:32:50 UTC 2021 - Aleksei Burlakov <aburla...@suse.com>
+
+- Remove --no-overwrite-sshkey option from the formula
+
+-------------------------------------------------------------------
+Mon Jan 18 15:20:34 UTC 2021 - Aleksei Burlakov <aburla...@suse.com>
+
+- qdevice support: it can be created when initializing a cluster
+
+-------------------------------------------------------------------
Thu Oct 15 21:33:58 UTC 2020 - Simranpal Singh <simranpal.si...@suse.com>
- Version bump 0.3.11
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.3.11+git.1602831614.0f63599/pillar.example
new/habootstrap-formula-0.3.11+git.1611046122.d1bd8e6/pillar.example
--- old/habootstrap-formula-0.3.11+git.1602831614.0f63599/pillar.example
2020-10-16 09:00:14.000000000 +0200
+++ new/habootstrap-formula-0.3.11+git.1611046122.d1bd8e6/pillar.example
2021-01-19 09:48:42.000000000 +0100
@@ -58,6 +58,10 @@
# meta:
# resource-stickiness: 3000
+ # optional: Configure qdevice
+ # qdevice:
+ # qnetd_hostname: hostname
+
# optional: Install required packages to run the cluster (true by default)
# pre-configured packages sometimes exist for development purposes
# install_packages: true
@@ -86,15 +90,10 @@
# hacluster_password: mypassword
# optional: Manage ssh keys usage
- # If this entry is not set, the formula expects that the sshkeys exist and
are authorized among the nodes
- # Use cases:
- # 1. ssh keys already exist and nodes are authorized to ssh each other.
Don't set this entry
- # 2. ssh keys already exist but you want to overwrite them with random new
keys, set overwrite to true
- # 3. ssh keys don't exist and you have the 1st node password. Use this
example
- # 4. If ssh keys don't exist and you don't want to set the password here,
the cluster cannot be created!
+ # If your nodes don't have ssh keys, you should put the root password here,
the system
+ # will make them for you. If there are ssh keys, you can leave this
parameter.
+ # (In the previous versions the keys were overwritten sometimes. It happenes
no more.)
# ssheys:
- # # Overwrite current keys (new keys are created if no keys are found)
- # overwrite: true # false by default
# # First node root password. This entry is used to configure the
authorized_keys file from the joining nodes
# password: admin # not set by default
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.3.11+git.1602831614.0f63599/test/pillar/cluster.sls
new/habootstrap-formula-0.3.11+git.1611046122.d1bd8e6/test/pillar/cluster.sls
---
old/habootstrap-formula-0.3.11+git.1602831614.0f63599/test/pillar/cluster.sls
2020-10-16 09:00:14.000000000 +0200
+++
new/habootstrap-formula-0.3.11+git.1611046122.d1bd8e6/test/pillar/cluster.sls
2021-01-19 09:48:42.000000000 +0100
@@ -7,5 +7,4 @@
device: /dev/watchdog
ntp: pool.ntp.org
sshkeys:
- overwrite: true
password: vagrant
