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-28 21:22:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/habootstrap-formula (Old)
and /work/SRC/openSUSE:Factory/.habootstrap-formula.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "habootstrap-formula"
Thu Jan 28 21:22:42 2021 rev:21 rq:867351 version:0.4.1+git.1611775401.451718e
Changes:
--------
--- /work/SRC/openSUSE:Factory/habootstrap-formula/habootstrap-formula.changes
2021-01-21 21:57:00.753849802 +0100
+++
/work/SRC/openSUSE:Factory/.habootstrap-formula.new.28504/habootstrap-formula.changes
2021-01-28 21:22:43.475668465 +0100
@@ -1,0 +2,7 @@
+Wed Jan 27 12:30:35 UTC 2021 - Xabier Arbulu <[email protected]>
+
+- Version bump 0.4.1
+ * Ass sshkeys to default dictionary to allow usage with this item
+ (bsc#1181453)
+
+-------------------------------------------------------------------
Old:
----
habootstrap-formula-0.4.0+git.1611213679.df6b3fb.tar.gz
New:
----
habootstrap-formula-0.4.1+git.1611775401.451718e.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ habootstrap-formula.spec ++++++
--- /var/tmp/diff_new_pack.Vu5lqm/_old 2021-01-28 21:22:43.955669225 +0100
+++ /var/tmp/diff_new_pack.Vu5lqm/_new 2021-01-28 21:22:43.959669231 +0100
@@ -20,7 +20,7 @@
Name: habootstrap-formula
Group: System/Packages
-Version: 0.4.0+git.1611213679.df6b3fb
+Version: 0.4.1+git.1611775401.451718e
Release: 0
Summary: HA cluster (crmsh) deployment salt formula
++++++ _service ++++++
--- /var/tmp/diff_new_pack.Vu5lqm/_old 2021-01-28 21:22:44.003669301 +0100
+++ /var/tmp/diff_new_pack.Vu5lqm/_new 2021-01-28 21:22:44.003669301 +0100
@@ -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.0+git.%ct.%h</param>
- <param name="revision">df6b3fb0e244092a0e78f323698057866554ce34</param>
+ <param name="versionformat">0.4.1+git.%ct.%h</param>
+ <param name="revision">451718e7f1cb717eb5cc65e7c5cfb73f2e2079e7</param>
</service>
<service name="recompress" mode="disabled">
++++++ habootstrap-formula-0.4.0+git.1611213679.df6b3fb.tar.gz ->
habootstrap-formula-0.4.1+git.1611775401.451718e.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/.travis.yml
new/habootstrap-formula-0.4.1+git.1611775401.451718e/.travis.yml
--- old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/.travis.yml
2021-01-21 08:21:19.000000000 +0100
+++ new/habootstrap-formula-0.4.1+git.1611775401.451718e/.travis.yml
2021-01-27 20:23:21.000000000 +0100
@@ -22,7 +22,7 @@
script:
- |
# validate states
- ci/validate-formula.sh
+ test/validate-formula.sh
- stage: delivery
if: type != pull_request
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/README.md
new/habootstrap-formula-0.4.1+git.1611775401.451718e/README.md
--- old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/README.md
2021-01-21 08:21:19.000000000 +0100
+++ new/habootstrap-formula-0.4.1+git.1611775401.451718e/README.md
2021-01-27 20:23:21.000000000 +0100
@@ -115,33 +115,20 @@
## Test
-The `Vagrantfile` and `test/` folder in this repository provides a
-sample cluster configuration that uses the formula to create the HA
-cluster.
+The `test` folder contains a set of tests to check the integrity of the
formula. The tests check
+if the provided pillar data is correctly rendered to find inconsistencies on
the usage of the
+user input. The tests don't really check if the `salt` code works properly,
they rather test if
+the formula uses and renders the states with the correct values.
-This has been tested with Vagrant 2.1.2 on openSUSE Leap 15, but
-should hopefully work with other versions as well.
+In order to run the tests execute:
-``` bash
+```
cd habootstrap-formula
-vagrant up
-./test/run
+bash ./test/validate-formula.sh
```
-These steps will create the cluster nodes (salt master, and two ha
-cluster nodes). In order to play with the formula, the file
-`test/pillar/cluster.sls` can be changed to apply different options to
-the cluster nodes (check the options in `pillar.example`).
-
-To add more nodes to the cluster, new nodes information must be added
-to `Vagrantfile`, `test/salt/common/hosts.sls` and `test/salt/top.sls`
-files.
-
-To access to the different nodes and play with them run:
-
-``` bash
-vagrant ssh {nodename}
-```
+In order to improve or add new tests the pillar example from
`test/test_pillars` can be changed (or
+add new pillar files).
### Troubleshooting
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/_service
new/habootstrap-formula-0.4.1+git.1611775401.451718e/_service
--- old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/_service
2021-01-21 08:21:19.000000000 +0100
+++ new/habootstrap-formula-0.4.1+git.1611775401.451718e/_service
2021-01-27 20:23:21.000000000 +0100
@@ -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.0+git.%ct.%h</param>
+ <param name="versionformat">0.4.1+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.0+git.1611213679.df6b3fb/ci/_modules/crm.py
new/habootstrap-formula-0.4.1+git.1611775401.451718e/ci/_modules/crm.py
--- old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/ci/_modules/crm.py
2021-01-21 08:21:19.000000000 +0100
+++ new/habootstrap-formula-0.4.1+git.1611775401.451718e/ci/_modules/crm.py
1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-def detect_cloud():
- '''
- Mock detect_cloud method for CI
- '''
- return 'microsoft-azure'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/ci/validate-formula.sh
new/habootstrap-formula-0.4.1+git.1611775401.451718e/ci/validate-formula.sh
--- old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/ci/validate-formula.sh
2021-01-21 08:21:19.000000000 +0100
+++ new/habootstrap-formula-0.4.1+git.1611775401.451718e/ci/validate-formula.sh
1970-01-01 01:00:00.000000000 +0100
@@ -1,105 +0,0 @@
-#! /bin/bash
-
-# this script is intended to be executed via PRs travis CI
-set -e
-
-## this will generate the pillar
-function generate_cluster_pillar {
- METHOD="$1"
- cat > test/pillar/cluster.sls <<EOF
- cluster:
- name: 'hacluster'
- $METHOD
- remove: ['hana03']
- interface: 'eth1'
- watchdog:
- module: softdog
- device: /dev/watchdog
- sbd:
- device: '/dev/vdc'
- ntp: pool.ntp.org
- sshkeys:
- password: linux
- resource_agents:
- - SAPHanaSR
- hacluster_password: mypassword
- configure:
- method: update
- template:
- source: /srv/salt/hana/templates/scale_up_resources.j2
- parameters:
- sid: prd
- instance: 00
- virtual_ip: 192.168.107.50
- virtual_ip_mask: 24
- platform: libvirt
- prefer_takeover: true
- auto_register: false
-EOF
-}
-
-
-
-echo "==========================================="
-echo " generating pillar and top.sls conf files "
-echo "==========================================="
-
-generate_cluster_pillar "init: 'hana01'"
-cat > top.sls <<EOF
-base:
- '*':
- - cluster
-EOF
-
-echo "top.sls and pillar --> DONE"
-echo
-
-
-echo "==========================================="
-echo "Using primary host - Running init"
-echo "==========================================="
-
-cat >grains <<EOF
-host: hana01
-EOF
-
-cat >minion <<EOF
-root_dir: $PWD
-id: travis
-EOF
-
-sudo salt-call state.show_highstate --local --file-root=./ --config-dir=.
--pillar-root=test/pillar --module-dirs=ci/_modules --retcode-passthrough -l
debug
-
-echo
-echo "==========================================="
-echo " Using secondary host - Running join "
-echo "==========================================="
-
-generate_cluster_pillar "init: 'hana01'"
-cat >grains <<EOF
-host: hana02
-EOF
-
-cat >minion <<EOF
-root_dir: $PWD
-id: travis
-EOF
-
-sudo salt-call state.show_highstate --local --file-root=./ --config-dir=.
--pillar-root=test/pillar --module-dirs=ci/_modules --retcode-passthrough -l
debug
-
-echo
-echo "==========================================="
-echo " Using third host - Running remove "
-echo "==========================================="
-
-generate_cluster_pillar "init: 'hana01'"
-cat >grains <<EOF
-host: hana03
-EOF
-
-cat >minion <<EOF
-root_dir: $PWD
-id: travis
-EOF
-
-sudo salt-call state.show_highstate --local --file-root=./ --config-dir=.
--pillar-root=test/pillar --module-dirs=ci/_modules --retcode-passthrough -l
debug
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/cluster/defaults.yaml
new/habootstrap-formula-0.4.1+git.1611775401.451718e/cluster/defaults.yaml
--- old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/cluster/defaults.yaml
2021-01-21 08:21:19.000000000 +0100
+++ new/habootstrap-formula-0.4.1+git.1611775401.451718e/cluster/defaults.yaml
2021-01-27 20:23:21.000000000 +0100
@@ -3,5 +3,6 @@
install_packages: true
join_timeout: 60
wait_for_initialization: 20
+ sshkeys: {}
remove: []
monitoring_enabled: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/habootstrap-formula.changes
new/habootstrap-formula-0.4.1+git.1611775401.451718e/habootstrap-formula.changes
---
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/habootstrap-formula.changes
2021-01-21 08:21:19.000000000 +0100
+++
new/habootstrap-formula-0.4.1+git.1611775401.451718e/habootstrap-formula.changes
2021-01-27 20:23:21.000000000 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Wed Jan 27 12:30:35 UTC 2021 - Xabier Arbulu <[email protected]>
+
+- Version bump 0.4.1
+ * Ass sshkeys to default dictionary to allow usage with this item
+ (bsc#1181453)
+
+-------------------------------------------------------------------
Wed Jan 20 08:28:05 UTC 2021 - Xabier Arbulu <[email protected]>
- Version bump 0.4.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/_modules/crm.py
new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/_modules/crm.py
--- old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/_modules/crm.py
1970-01-01 01:00:00.000000000 +0100
+++ new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/_modules/crm.py
2021-01-27 20:23:21.000000000 +0100
@@ -0,0 +1,5 @@
+def detect_cloud():
+ '''
+ Mock detect_cloud method for CI
+ '''
+ return 'microsoft-azure'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/config/etc/master
new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/config/etc/master
--- old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/config/etc/master
2021-01-21 08:21:19.000000000 +0100
+++ new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/config/etc/master
1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-auto_accept: True
-#file_roots:
-# base:
-# - /srv/salt
-# - /vagrant
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/config/etc/minion
new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/config/etc/minion
--- old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/config/etc/minion
2021-01-21 08:21:19.000000000 +0100
+++ new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/config/etc/minion
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-master: 10.13.38.11
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/config/sshkeys/vagrant
new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/config/sshkeys/vagrant
---
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/config/sshkeys/vagrant
2021-01-21 08:21:19.000000000 +0100
+++
new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/config/sshkeys/vagrant
1970-01-01 01:00:00.000000000 +0100
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzI
-w+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoP
-kcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2
-hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NO
-Td0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcW
-yLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQIBIwKCAQEA4iqWPJXtzZA68mKd
-ELs4jJsdyky+ewdZeNds5tjcnHU5zUYE25K+ffJED9qUWICcLZDc81TGWjHyAqD1
-Bw7XpgUwFgeUJwUlzQurAv+/ySnxiwuaGJfhFM1CaQHzfXphgVml+fZUvnJUTvzf
-TK2Lg6EdbUE9TarUlBf/xPfuEhMSlIE5keb/Zz3/LUlRg8yDqz5w+QWVJ4utnKnK
-iqwZN0mwpwU7YSyJhlT4YV1F3n4YjLswM5wJs2oqm0jssQu/BT0tyEXNDYBLEF4A
-sClaWuSJ2kjq7KhrrYXzagqhnSei9ODYFShJu8UWVec3Ihb5ZXlzO6vdNQ1J9Xsf
-4m+2ywKBgQD6qFxx/Rv9CNN96l/4rb14HKirC2o/orApiHmHDsURs5rUKDx0f9iP
-cXN7S1uePXuJRK/5hsubaOCx3Owd2u9gD6Oq0CsMkE4CUSiJcYrMANtx54cGH7Rk
-EjFZxK8xAv1ldELEyxrFqkbE4BKd8QOt414qjvTGyAK+OLD3M2QdCQKBgQDtx8pN
-CAxR7yhHbIWT1AH66+XWN8bXq7l3RO/ukeaci98JfkbkxURZhtxV/HHuvUhnPLdX
-3TwygPBYZFNo4pzVEhzWoTtnEtrFueKxyc3+LjZpuo+mBlQ6ORtfgkr9gBVphXZG
-YEzkCD3lVdl8L4cw9BVpKrJCs1c5taGjDgdInQKBgHm/fVvv96bJxc9x1tffXAcj
-3OVdUN0UgXNCSaf/3A/phbeBQe9xS+3mpc4r6qvx+iy69mNBeNZ0xOitIjpjBo2+
-dBEjSBwLk5q5tJqHmy/jKMJL4n9ROlx93XS+njxgibTvU6Fp9w+NOFD/HvxB3Tcz
-6+jJF85D5BNAG3DBMKBjAoGBAOAxZvgsKN+JuENXsST7F89Tck2iTcQIT8g5rwWC
-P9Vt74yboe2kDT531w8+egz7nAmRBKNM751U/95P9t88EDacDI/Z2OwnuFQHCPDF
-llYOUI+SpLJ6/vURRbHSnnn8a/XG+nzedGH5JGqEJNQsz+xT2axM0/W/CRknmGaJ
-kda/AoGANWrLCz708y7VYgAtW2Uf1DPOIYMdvo6fxIB5i9ZfISgcJ/bbCUkFrhoH
-+vq/5CIWxCPp0f85R4qxxQ5ihxJ0YDQT9Jpx4TMss4PSavPaBH3RXow5Ohe+bYoQ
-NE5OgEXk2wVfZczCZpigBKbKZHNYcelXtTt/nP3rsCuGcM4h53s=
------END RSA PRIVATE KEY-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/config/sshkeys/vagrant.pub
new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/config/sshkeys/vagrant.pub
---
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/config/sshkeys/vagrant.pub
2021-01-21 08:21:19.000000000 +0100
+++
new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/config/sshkeys/vagrant.pub
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-ssh-rsa
AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ==
vagrant insecure public key
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/pillar/cluster.sls
new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/pillar/cluster.sls
---
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/pillar/cluster.sls
2021-01-21 08:21:19.000000000 +0100
+++
new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/pillar/cluster.sls
1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-cluster:
- init: node1
- admin_ip: 192.168.121.50
- interface: eth0
- watchdog:
- module: softdog
- device: /dev/watchdog
- ntp: pool.ntp.org
- sshkeys:
- password: vagrant
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/pillar/top.sls
new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/pillar/top.sls
--- old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/pillar/top.sls
2021-01-21 08:21:19.000000000 +0100
+++ new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/pillar/top.sls
1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-base:
- '*':
- - cluster
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/run
new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/run
--- old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/run
2021-01-21 08:21:19.000000000 +0100
+++ new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/run
1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-#!/bin/bash
-set -e
-vagrant ssh master -- sudo rm /etc/salt/minion
-vagrant ssh master -- sudo salt-call --local state.apply
-vagrant ssh master -- sudo salt '\*' state.highstate
-vagrant ssh node1 -- sudo crm_mon -1s | grep "CLUSTER OK: [1-9] nodes online,"
-vagrant ssh node2 -- sudo crm_mon -1s | grep "CLUSTER OK: [1-9] nodes online,"
-vagrant ssh node3 -- sudo crm_mon -1s | grep "CLUSTER OK: [1-9] nodes online,"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/salt/common/hosts.sls
new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/salt/common/hosts.sls
---
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/salt/common/hosts.sls
2021-01-21 08:21:19.000000000 +0100
+++
new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/salt/common/hosts.sls
1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-master:
- host.present:
- - ip: 10.13.38.11
-
-{% for idx in 1, 2, 3 %}
-node{{ idx }}:
- host.present:
- - ip: 10.13.38.{{ idx + 11 }}
-{% endfor %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/salt/common/init.sls
new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/salt/common/init.sls
---
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/salt/common/init.sls
2021-01-21 08:21:19.000000000 +0100
+++
new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/salt/common/init.sls
1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-include:
- - common.hosts
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/salt/master/init.sls
new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/salt/master/init.sls
---
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/salt/master/init.sls
2021-01-21 08:21:19.000000000 +0100
+++
new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/salt/master/init.sls
1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-include:
- - master.repos
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/salt/master/repos.sls
new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/salt/master/repos.sls
---
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/salt/master/repos.sls
2021-01-21 08:21:19.000000000 +0100
+++
new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/salt/master/repos.sls
1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-add-shap-factory-repo:
- pkgrepo.managed:
- - name: shap-factory-repo
- - baseurl:
https://download.opensuse.org/repositories/network:/ha-clustering:/Factory/SLE_12_SP4/
- - gpgautoimport: True
-
-salt-shaptools:
- pkg.installed:
- - fromrepo: shap-factory-repo
- - retry:
- attempts: 3
- interval: 15
- - require:
- - add-shap-factory-repo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/salt/top.sls
new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/salt/top.sls
--- old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/salt/top.sls
2021-01-21 08:21:19.000000000 +0100
+++ new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/salt/top.sls
1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-base:
- 'master':
- - master
- 'node*':
- - common
- - cluster
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/test_pillars/advanced.yml
new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/test_pillars/advanced.yml
---
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/test_pillars/advanced.yml
1970-01-01 01:00:00.000000000 +0100
+++
new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/test_pillars/advanced.yml
2021-01-27 20:23:21.000000000 +0100
@@ -0,0 +1,63 @@
+cluster:
+ name: 'hacluster'
+ init: $METHOD
+ remove: ['hana03']
+ watchdog:
+ module: softdog
+ device: /dev/watchdog
+ interface: 'eth1'
+ unicast: true
+ wait_for_initialization: 10
+ join_timeout: 120
+ admin_ip: 10.20.30.40
+ sbd:
+ device:
+ - /dev/disk1
+ - /dev/disk2
+ configure_resource:
+ params:
+ param1: value1
+ param2: value2
+ op:
+ monitor:
+ timeout: 15
+ interval: 10
+ meta:
+ resource-stickiness: 3000
+ qdevice:
+ qnetd_hostname: qdevice_host
+ ntp: pool.ntp.org
+ monitoring_enabled: true
+ corosync:
+ totem:
+ token: 30000
+ interface:
+ bindnetaddr: 192.168.100.1
+ quorum:
+ expected_votes: 3
+ hacluster_password: mypassword
+ sshkeys:
+ password: linux
+ resource_agents:
+ - SAPHanaSR
+ configure:
+ properties:
+ stonith-timeout: 144s
+ tonith-enabled: true
+ rsc_defaults:
+ resource-stickiness: 1000
+ migration-threshold: 5000
+ op_defaults:
+ timeout: 600
+ record-pending: true
+ method: update
+ template:
+ source: /srv/salt/hana/templates/scale_up_resources.j2
+ parameters:
+ sid: prd
+ instance: 00
+ virtual_ip: 192.168.107.50
+ virtual_ip_mask: 24
+ platform: libvirt
+ prefer_takeover: true
+ auto_register: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/test_pillars/generic.yml
new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/test_pillars/generic.yml
---
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/test_pillars/generic.yml
1970-01-01 01:00:00.000000000 +0100
+++
new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/test_pillars/generic.yml
2021-01-27 20:23:21.000000000 +0100
@@ -0,0 +1,31 @@
+cluster:
+ name: 'hacluster'
+ init: $METHOD
+ join_timeout: 120
+ wait_for_initialization: 10
+ remove: ['hana03']
+ interface: 'eth1'
+ watchdog:
+ module: softdog
+ device: /dev/watchdog
+ sbd:
+ device: '/dev/vdc'
+ ntp: pool.ntp.org
+ sshkeys:
+ password: linux
+ resource_agents:
+ - SAPHanaSR
+ hacluster_password: mypassword
+ monitoring_enabled: true
+ configure:
+ method: update
+ template:
+ source: /srv/salt/hana/templates/scale_up_resources.j2
+ parameters:
+ sid: prd
+ instance: 00
+ virtual_ip: 192.168.107.50
+ virtual_ip_mask: 24
+ platform: libvirt
+ prefer_takeover: true
+ auto_register: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/test_pillars/minimal.yml
new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/test_pillars/minimal.yml
---
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/test_pillars/minimal.yml
1970-01-01 01:00:00.000000000 +0100
+++
new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/test_pillars/minimal.yml
2021-01-27 20:23:21.000000000 +0100
@@ -0,0 +1,4 @@
+cluster:
+ name: 'hacluster'
+ init: $METHOD
+ remove: ['hana03']
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/test_pillars/without_defaults.yml
new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/test_pillars/without_defaults.yml
---
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/test_pillars/without_defaults.yml
1970-01-01 01:00:00.000000000 +0100
+++
new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/test_pillars/without_defaults.yml
2021-01-27 20:23:21.000000000 +0100
@@ -0,0 +1,25 @@
+cluster:
+ init: $METHOD
+ remove: ['hana03']
+ interface: 'eth1'
+ watchdog:
+ module: softdog
+ device: /dev/watchdog
+ sbd:
+ device: '/dev/vdc'
+ ntp: pool.ntp.org
+ resource_agents:
+ - SAPHanaSR
+ hacluster_password: mypassword
+ configure:
+ method: update
+ template:
+ source: /srv/salt/hana/templates/scale_up_resources.j2
+ parameters:
+ sid: prd
+ instance: 00
+ virtual_ip: 192.168.107.50
+ virtual_ip_mask: 24
+ platform: libvirt
+ prefer_takeover: true
+ auto_register: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/validate-formula.sh
new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/validate-formula.sh
---
old/habootstrap-formula-0.4.0+git.1611213679.df6b3fb/test/validate-formula.sh
1970-01-01 01:00:00.000000000 +0100
+++
new/habootstrap-formula-0.4.1+git.1611775401.451718e/test/validate-formula.sh
2021-01-27 20:23:21.000000000 +0100
@@ -0,0 +1,103 @@
+#! /bin/bash
+
+# this script is intended to be executed via PRs travis CI
+set -e
+
+SCRIPT_PATH=$(realpath $0)
+SCRIPT_FOLDER=$(dirname $SCRIPT_PATH)
+
+## run salt
+function run_salt() {
+ SCRIPT_FOLDER=$1
+ sudo salt-call state.show_highstate --local --config-dir=$SCRIPT_FOLDER
--pillar-root=$SCRIPT_FOLDER/pillar --module-dirs=$SCRIPT_FOLDER/_modules
--retcode-passthrough -l debug
+}
+
+## this will generate the pillar substituting the METHOD variable
+function generate_cluster_pillar() {
+ PILLAR_FILE=$1
+ METHOD=$2
+ cat > $SCRIPT_FOLDER/pillar/cluster.sls <<EOF
+# Test file $PILLAR_FILE
+$(METHOD="$METHOD" envsubst < $PILLAR_FILE)
+EOF
+}
+
+function create_config() {
+ SCRIPT_FOLDER=$1
+ cat >$SCRIPT_FOLDER/minion <<EOF
+root_dir: $SCRIPT_FOLDER
+file_roots:
+ base:
+ - $SCRIPT_FOLDER
+ - $SCRIPT_FOLDER/..
+id: travis
+EOF
+}
+
+function create_salt_top() {
+ SCRIPT_FOLDER=$1
+ cat > $SCRIPT_FOLDER/top.sls <<EOF
+base:
+ '*':
+ - cluster
+EOF
+}
+
+function create_pillar_top() {
+ SCRIPT_FOLDER=$1
+ mkdir -p $SCRIPT_FOLDER/pillar
+ cat > $SCRIPT_FOLDER/pillar/top.sls <<EOF
+base:
+ '*':
+ - cluster
+EOF
+}
+
+function run_test() {
+ # Run the test
+ PILLAR_FILE=$1
+ echo "==========================================="
+ echo " generating pillar from $PILLAR_FILE and top.sls conf files "
+ echo "==========================================="
+ generate_cluster_pillar $PILLAR_FILE "hana01"
+
+ echo "==========================================="
+ echo "Using primary host - Running init"
+ echo "==========================================="
+
+
+ cat >$SCRIPT_FOLDER/grains <<EOF
+host: hana01
+EOF
+
+ run_salt $SCRIPT_FOLDER
+
+ echo "==========================================="
+ echo " Using secondary host - Running join "
+ echo "==========================================="
+
+ cat >$SCRIPT_FOLDER/grains <<EOF
+host: hana02
+EOF
+
+ run_salt $SCRIPT_FOLDER
+
+ echo
+ echo "==========================================="
+ echo " Using third host - Running remove "
+ echo "==========================================="
+
+ cat >$SCRIPT_FOLDER/grains <<EOF
+host: hana03
+EOF
+
+ run_salt $SCRIPT_FOLDER
+}
+
+# Run all the tests from test_pillar folder
+create_config $SCRIPT_FOLDER
+create_salt_top $SCRIPT_FOLDER
+create_pillar_top $SCRIPT_FOLDER
+for TEST_PILLAR_FILE in $SCRIPT_FOLDER/test_pillars/*; do
+ run_test $TEST_PILLAR_FILE
+done
