Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package salt-shaptools for openSUSE:Factory checked in at 2021-01-19 16:02:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/salt-shaptools (Old) and /work/SRC/openSUSE:Factory/.salt-shaptools.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "salt-shaptools" Tue Jan 19 16:02:18 2021 rev:23 rq:864116 version:0.3.11+git.1610983060.0bf6fcc Changes: -------- --- /work/SRC/openSUSE:Factory/salt-shaptools/salt-shaptools.changes 2020-11-23 10:49:40.530553366 +0100 +++ /work/SRC/openSUSE:Factory/.salt-shaptools.new.28504/salt-shaptools.changes 2021-01-19 16:02:45.291430797 +0100 @@ -1,0 +2,5 @@ +Wed Dec 16 09:04:29 UTC 2020 - Aleksei Burlakov <[email protected]> + +- qdevice support: it can be created when initializing a cluster + +------------------------------------------------------------------- Old: ---- salt-shaptools-0.3.11+git.1605797958.ae2f08a.tar.gz New: ---- salt-shaptools-0.3.11+git.1610983060.0bf6fcc.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ salt-shaptools.spec ++++++ --- /var/tmp/diff_new_pack.eWs1ry/_old 2021-01-19 16:02:45.847431637 +0100 +++ /var/tmp/diff_new_pack.eWs1ry/_new 2021-01-19 16:02:45.851431643 +0100 @@ -19,7 +19,7 @@ # See also https://en.opensuse.org/openSUSE:Specfile_guidelines Name: salt-shaptools -Version: 0.3.11+git.1605797958.ae2f08a +Version: 0.3.11+git.1610983060.0bf6fcc Release: 0 Summary: Salt modules and states for SAP Applications and SLE-HA components management ++++++ _service ++++++ --- /var/tmp/diff_new_pack.eWs1ry/_old 2021-01-19 16:02:45.883431691 +0100 +++ /var/tmp/diff_new_pack.eWs1ry/_new 2021-01-19 16:02:45.883431691 +0100 @@ -5,7 +5,7 @@ <param name="exclude">.git</param> <param name="filename">salt-shaptools</param> <param name="versionformat">0.3.11+git.%ct.%h</param> - <param name="revision">ae2f08a885e7125d53ab5eba4a2b692e937be6fb</param> + <param name="revision">0bf6fccd3119d0ba86d540f218d375140404b350</param> </service> <service name="recompress" mode="disabled"> ++++++ salt-shaptools-0.3.11+git.1605797958.ae2f08a.tar.gz -> salt-shaptools-0.3.11+git.1610983060.0bf6fcc.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-shaptools-0.3.11+git.1605797958.ae2f08a/salt/modules/crmshmod.py new/salt-shaptools-0.3.11+git.1610983060.0bf6fcc/salt/modules/crmshmod.py --- old/salt-shaptools-0.3.11+git.1605797958.ae2f08a/salt/modules/crmshmod.py 2020-11-19 15:59:18.000000000 +0100 +++ new/salt-shaptools-0.3.11+git.1610983060.0bf6fcc/salt/modules/crmshmod.py 2021-01-18 16:17:40.000000000 +0100 @@ -290,6 +290,7 @@ sbd=None, sbd_dev=None, no_overwrite_sshkey=False, + qnetd_hostname=None, quiet=None): ''' crm cluster init command execution @@ -311,6 +312,9 @@ cmd = '{cmd} -S'.format(cmd=cmd) if no_overwrite_sshkey: cmd = '{cmd} --no-overwrite-sshkey'.format(cmd=cmd) + if qnetd_hostname: + cmd = '{cmd} --qnetd-hostname {qnetd_hostname}'.format( + cmd=cmd, qnetd_hostname=qnetd_hostname) if quiet: cmd = '{cmd} -q'.format(cmd=cmd) @@ -324,6 +328,7 @@ admin_ip=None, sbd=None, sbd_dev=None, + qnetd_hostname=None, quiet=None): ''' ha-cluster-init command execution @@ -342,6 +347,9 @@ cmd = '{cmd} {sbd_str}'.format(cmd=cmd, sbd_str=sbd_str) elif sbd: cmd = '{cmd} -S'.format(cmd=cmd) + if qnetd_hostname: + cmd = '{cmd} --qnetd-hostname {qnetd_hostname}'.format( + cmd=cmd, qnetd_hostname=qnetd_hostname) if quiet: cmd = '{cmd} -q'.format(cmd=cmd) @@ -362,6 +370,7 @@ sbd=None, sbd_dev=None, no_overwrite_sshkey=False, + qnetd_hostname=None, quiet=None): ''' Initialize a cluster from scratch. @@ -387,6 +396,8 @@ no_overwrite_sshkey No overwrite the currently existing sshkey (/root/.ssh/id_rsa) Only available after crmsh 3.0.0 + qnetd_hostname: + The name of the qnetd node. If none, no qdevice is created quiet: execute the command in quiet mode (no output) @@ -403,13 +414,14 @@ # and create the corresponing UT if __salt__['crm.use_crm']: return _crm_init( - name, watchdog, interface, unicast, admin_ip, sbd, sbd_dev, no_overwrite_sshkey, quiet) + name, watchdog, interface, unicast, admin_ip, sbd, sbd_dev, no_overwrite_sshkey, + qnetd_hostname, quiet) LOGGER.warning('The parameter name is not considered!') LOGGER.warning('--no_overwrite_sshkey option not available') return _ha_cluster_init( - watchdog, interface, unicast, admin_ip, sbd, sbd_dev, quiet) + watchdog, interface, unicast, admin_ip, sbd, sbd_dev, qnetd_hostname, quiet) def _crm_join( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-shaptools-0.3.11+git.1605797958.ae2f08a/salt/states/crmshmod.py new/salt-shaptools-0.3.11+git.1610983060.0bf6fcc/salt/states/crmshmod.py --- old/salt-shaptools-0.3.11+git.1605797958.ae2f08a/salt/states/crmshmod.py 2020-11-19 15:59:18.000000000 +0100 +++ new/salt-shaptools-0.3.11+git.1610983060.0bf6fcc/salt/states/crmshmod.py 2021-01-18 16:17:40.000000000 +0100 @@ -106,7 +106,8 @@ sbd=None, sbd_dev=None, no_overwrite_sshkey=False, - quiet=None): + quiet=None, + qnetd_hostname=None): """ Machine is running a cluster node @@ -131,6 +132,8 @@ Only available after crmsh 3.0.0 quiet: execute the command in quiet mode (no output) + qnetd_hostname: + The name of the qnetd node. If none, no qdevice is created """ ret = {'name': name, 'changes': {}, @@ -159,6 +162,7 @@ sbd=sbd, sbd_dev=sbd_dev, no_overwrite_sshkey=no_overwrite_sshkey, + qnetd_hostname=qnetd_hostname, quiet=quiet) if result: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-shaptools-0.3.11+git.1605797958.ae2f08a/salt-shaptools.changes new/salt-shaptools-0.3.11+git.1610983060.0bf6fcc/salt-shaptools.changes --- old/salt-shaptools-0.3.11+git.1605797958.ae2f08a/salt-shaptools.changes 2020-11-19 15:59:18.000000000 +0100 +++ new/salt-shaptools-0.3.11+git.1610983060.0bf6fcc/salt-shaptools.changes 2021-01-18 16:17:40.000000000 +0100 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Dec 16 09:04:29 UTC 2020 - Aleksei Burlakov <[email protected]> + +- qdevice support: it can be created when initializing a cluster + +------------------------------------------------------------------- Thu Oct 15 07:14:20 UTC 2020 - Xabier Arbulu <[email protected]> - Version 0.3.11 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-shaptools-0.3.11+git.1605797958.ae2f08a/tests/unit/modules/test_crmshmod.py new/salt-shaptools-0.3.11+git.1610983060.0bf6fcc/tests/unit/modules/test_crmshmod.py --- old/salt-shaptools-0.3.11+git.1605797958.ae2f08a/tests/unit/modules/test_crmshmod.py 2020-11-19 15:59:18.000000000 +0100 +++ new/salt-shaptools-0.3.11+git.1610983060.0bf6fcc/tests/unit/modules/test_crmshmod.py 2021-01-18 16:17:40.000000000 +0100 @@ -349,23 +349,23 @@ with patch.dict(crmshmod.__salt__, {'cmd.retcode': mock_cmd_run}): result = crmshmod._crm_init( - 'hacluster', 'dog', 'eth1', True, '192.168.1.50', True, ['dev1', 'dev2'], True, True) + 'hacluster', 'dog', 'eth1', True, '192.168.1.50', True, ['dev1', 'dev2'], True, 'alice', True) assert result mock_cmd_run.assert_called_once_with( '{} cluster init -y -n {} -w {} -i {} -u -A {} ' - '-s {} -s {} --no-overwrite-sshkey -q'.format( - crmshmod.CRM_COMMAND, 'hacluster', 'dog', 'eth1', '192.168.1.50', 'dev1', 'dev2')) + '-s {} -s {} --no-overwrite-sshkey --qnetd-hostname {} -q'.format( + crmshmod.CRM_COMMAND, 'hacluster', 'dog', 'eth1', '192.168.1.50', 'dev1', 'dev2', 'alice')) # SBD diskless mock_cmd_run.reset_mock() with patch.dict(crmshmod.__salt__, {'cmd.retcode': mock_cmd_run}): result = crmshmod._crm_init( - 'hacluster', 'dog', 'eth1', True, '192.168.1.50', True, None, True, True) + 'hacluster', 'dog', 'eth1', True, '192.168.1.50', True, None, True, 'alice', True) assert result mock_cmd_run.assert_called_once_with( '{} cluster init -y -n {} -w {} -i {} -u -A {} ' - '-S --no-overwrite-sshkey -q'.format( - crmshmod.CRM_COMMAND, 'hacluster', 'dog', 'eth1', '192.168.1.50')) + '-S --no-overwrite-sshkey --qnetd-hostname {} -q'.format( + crmshmod.CRM_COMMAND, 'hacluster', 'dog', 'eth1', '192.168.1.50', 'alice')) def test_ha_cluster_init_basic(self): ''' @@ -394,14 +394,14 @@ 'network.get_hostname': mock_get_hostname, 'network.interface_ip': mock_interface_ip}): result = crmshmod._ha_cluster_init( - 'dog', 'eth1', True, '192.168.1.50', True, ['dev1', 'dev2'], True) + 'dog', 'eth1', True, '192.168.1.50', True, ['dev1', 'dev2'], 'alice', True) assert result == 0 mock_watchdog.assert_called_once_with('dog') mock_corosync.assert_called_once_with('1.0.1.0', 'node') mock_interface_ip.assert_called_once_with('eth1') mock_cmd_run.assert_called_once_with( - '{} -y -i {} -A {} -s {} -s {} -q'.format( - crmshmod.HA_INIT_COMMAND, 'eth1', '192.168.1.50', 'dev1', 'dev2')) + '{} -y -i {} -A {} -s {} -s {} --qnetd-hostname {} -q'.format( + crmshmod.HA_INIT_COMMAND, 'eth1', '192.168.1.50', 'dev1', 'dev2', 'alice')) # SBD diskless mock_cmd_run.reset_mock() @@ -410,11 +410,11 @@ 'network.get_hostname': mock_get_hostname, 'network.interface_ip': mock_interface_ip}): result = crmshmod._ha_cluster_init( - 'dog', 'eth1', True, '192.168.1.50', True, None, True) + 'dog', 'eth1', True, '192.168.1.50', True, None, 'alice', True) assert result == 0 mock_cmd_run.assert_called_once_with( - '{} -y -i {} -A {} -S -q'.format( - crmshmod.HA_INIT_COMMAND, 'eth1', '192.168.1.50')) + '{} -y -i {} -A {} -S --qnetd-hostname {} -q'.format( + crmshmod.HA_INIT_COMMAND, 'eth1', '192.168.1.50', 'alice')) @mock.patch('salt.modules.crmshmod._crm_init') def test_cluster_init_crm(self, crm_init): @@ -427,7 +427,7 @@ value = crmshmod.cluster_init('hacluster', 'dog', 'eth1', sbd=True, sbd_dev='dev1') assert value == 0 crm_init.assert_called_once_with( - 'hacluster', 'dog', 'eth1', None, None, True, ['dev1'], False, None) + 'hacluster', 'dog', 'eth1', None, None, True, ['dev1'], False, None, None) crm_init.reset_mock() with patch.dict(crmshmod.__salt__, {'crm.use_crm': True}): @@ -435,7 +435,7 @@ value = crmshmod.cluster_init('hacluster', 'dog', 'eth1', sbd=False, sbd_dev=['disk1', 'disk2']) assert value == 0 crm_init.assert_called_once_with( - 'hacluster', 'dog', 'eth1', None, None, False, ['disk1', 'disk2'], False, None) + 'hacluster', 'dog', 'eth1', None, None, False, ['disk1', 'disk2'], False, None, None) @mock.patch('logging.Logger.warning') @mock.patch('salt.modules.crmshmod._ha_cluster_init') @@ -454,7 +454,7 @@ mock.call('--no_overwrite_sshkey option not available') ]) ha_cluster_init.assert_called_once_with( - 'dog', 'eth1', None, None, None, ['dev1'], None) + 'dog', 'eth1', None, None, None, ['dev1'], None, None) def test_crm_join_basic(self): ''' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-shaptools-0.3.11+git.1605797958.ae2f08a/tests/unit/states/test_crmshmod.py new/salt-shaptools-0.3.11+git.1610983060.0bf6fcc/tests/unit/states/test_crmshmod.py --- old/salt-shaptools-0.3.11+git.1605797958.ae2f08a/tests/unit/states/test_crmshmod.py 2020-11-19 15:59:18.000000000 +0100 +++ new/salt-shaptools-0.3.11+git.1610983060.0bf6fcc/tests/unit/states/test_crmshmod.py 2021-01-18 16:17:40.000000000 +0100 @@ -189,6 +189,7 @@ sbd=True, sbd_dev='/dev/sbd', no_overwrite_sshkey=True, + qnetd_hostname=None, quiet=False) def test_initialized_error(self): @@ -225,6 +226,7 @@ sbd=True, sbd_dev='/dev/sbd', no_overwrite_sshkey=True, + qnetd_hostname=None, quiet=False) def test_initialized_command_error(self): @@ -262,6 +264,7 @@ sbd=True, sbd_dev='/dev/sbd', no_overwrite_sshkey=False, + qnetd_hostname=None, quiet=False) # 'joined' function tests
