Hello community,
here is the log from the commit of package sesdev for openSUSE:Factory checked
in at 2020-04-28 22:32:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sesdev (Old)
and /work/SRC/openSUSE:Factory/.sesdev.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sesdev"
Tue Apr 28 22:32:42 2020 rev:9 rq:798686 version:1.1.12+1588084576.g8b2afa1
Changes:
--------
--- /work/SRC/openSUSE:Factory/sesdev/sesdev.changes 2020-04-25
20:36:02.674977246 +0200
+++ /work/SRC/openSUSE:Factory/.sesdev.new.2738/sesdev.changes 2020-04-28
22:33:15.297852787 +0200
@@ -1,0 +2,11 @@
+Tue Apr 28 14:36:27 UTC 2020 - Nathan Cutler <ncut...@suse.com>
+
+- Update to 1.1.12+1588084576.g8b2afa1:
+ + upstream 1.1.12 release (2020-04-28)
+ * provision.sh: enable autorefresh on all repos (PR #288)
+ * seslib: fix "Unused argument" linter warning (PR #286)
+ * provision.sh.j2: Properly prepare CaaSP nodes (PR #283)
+ * ceph_salt_deployment: really sync clocks (PR #285)
+ * Rename 'ceph-salt deploy' to 'ceph-salt apply' (PR #280)
+
+-------------------------------------------------------------------
Old:
----
sesdev-1.1.11+1587722868.gc7e5625.tar.gz
New:
----
sesdev-1.1.12+1588084576.g8b2afa1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sesdev.spec ++++++
--- /var/tmp/diff_new_pack.TcUfQM/_old 2020-04-28 22:33:16.633855279 +0200
+++ /var/tmp/diff_new_pack.TcUfQM/_new 2020-04-28 22:33:16.637855287 +0200
@@ -16,7 +16,7 @@
#
Name: sesdev
-Version: 1.1.11+1587722868.gc7e5625
+Version: 1.1.12+1588084576.g8b2afa1
Release: 1%{?dist}
Summary: CLI tool to deploy and manage SES clusters
License: MIT
++++++ sesdev-1.1.11+1587722868.gc7e5625.tar.gz ->
sesdev-1.1.12+1588084576.g8b2afa1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sesdev-1.1.11+1587722868.gc7e5625/CHANGELOG.md
new/sesdev-1.1.12+1588084576.g8b2afa1/CHANGELOG.md
--- old/sesdev-1.1.11+1587722868.gc7e5625/CHANGELOG.md 2020-04-24
12:07:48.576052909 +0200
+++ new/sesdev-1.1.12+1588084576.g8b2afa1/CHANGELOG.md 2020-04-28
16:36:16.408270729 +0200
@@ -7,6 +7,19 @@
## [Unreleased]
+## [1.1.12] - 2020-04-28
+
+### Added
+- provision.sh: enable autorefresh on all repos (PR #288)
+
+### Fixed
+- seslib: fix "Unused argument" linter warning (PR #286)
+- provision.sh.j2: Properly prepare CaaSP nodes (PR #283)
+- ceph_salt_deployment: really sync clocks (PR #285)
+
+### Changed
+- Rename 'ceph-salt deploy' to 'ceph-salt apply' (PR #280)
+
## [1.1.11] - 2020-04-24
### Added
@@ -329,7 +342,8 @@
- Minimal README with a few usage instructions.
- The CHANGELOG file.
-[unreleased]: https://github.com/SUSE/sesdev/compare/v1.1.11...HEAD
+[unreleased]: https://github.com/SUSE/sesdev/compare/v1.1.12...HEAD
+[1.1.12]: https://github.com/SUSE/sesdev/releases/tag/v1.1.12
[1.1.11]: https://github.com/SUSE/sesdev/releases/tag/v1.1.11
[1.1.10]: https://github.com/SUSE/sesdev/releases/tag/v1.1.10
[1.1.9]: https://github.com/SUSE/sesdev/releases/tag/v1.1.9
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sesdev-1.1.11+1587722868.gc7e5625/HOWTORELEASE.md
new/sesdev-1.1.12+1588084576.g8b2afa1/HOWTORELEASE.md
--- old/sesdev-1.1.11+1587722868.gc7e5625/HOWTORELEASE.md 2020-04-24
12:07:48.576052909 +0200
+++ new/sesdev-1.1.12+1588084576.g8b2afa1/HOWTORELEASE.md 2020-04-28
16:36:16.408270729 +0200
@@ -12,7 +12,7 @@
- Update the links at the bottom of the file.
4. Update version number in `sesdev.spec` to `Version: <version_number>`
5. Create a commit with title `Bump to v<version_number>` containing the
- modifications to `CHANGELOG.md` made in the previous two steps.
+ modifications made in the previous two steps.
6. Create an annotated tag for the above commit: `git tag -s -a
v<version_number> -m"version <version_number>"`.
- The message should be `version <version_number>`.
- Using `git show v<version_number>`, review the commit message of the
annotated tag.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sesdev-1.1.11+1587722868.gc7e5625/contrib/standalone.sh
new/sesdev-1.1.12+1588084576.g8b2afa1/contrib/standalone.sh
--- old/sesdev-1.1.11+1587722868.gc7e5625/contrib/standalone.sh 2020-04-24
12:07:48.580052906 +0200
+++ new/sesdev-1.1.12+1588084576.g8b2afa1/contrib/standalone.sh 2020-04-28
16:36:16.412270726 +0200
@@ -118,12 +118,13 @@
}
TEMP=$(getopt -o h \
---long
"help,ceph-salt-from-source,full,makecheck,nautilus,octopus,pacific,ses5,ses6,ses7"
\
+--long
"help,caasp4,ceph-salt-from-source,full,makecheck,nautilus,octopus,pacific,ses5,ses6,ses7"
\
-n 'standalone.sh' -- "$@") || ( echo "Terminating..." >&2 ; exit 1 )
eval set -- "$TEMP"
# process command-line options
NORMAL_OPERATION="not_empty"
+CAASP4=""
CEPH_SALT_FROM_SOURCE=""
FULL=""
MAKECHECK=""
@@ -135,6 +136,7 @@
SES7=""
while true ; do
case "$1" in
+ --caasp4) CAASP4="--caasp4" ; shift ;;
--ceph-salt-from-source)
CEPH_SALT_FROM_SOURCE="--ceph-salt-branch=master" ; shift ;;
--full) FULL="$1" ; shift ;;
--makecheck) MAKECHECK="$1" ; shift ;;
@@ -150,12 +152,15 @@
esac
done
-if [ "$FULL" ] || [ "$MAKECHECK" ] || [ "$NAUTILUS" ] || [ "$OCTOPUS" ] || [
"$PACIFIC" ] || [ "$SES5" ] || [ "$SES6" ] || [ "$SES7" ] ; then
+if [ "$CAASP4" ] || [ "$FULL" ] || [ "$MAKECHECK" ] || [ "$NAUTILUS" ] || [
"$OCTOPUS" ] || [ "$PACIFIC" ] || [ "$SES5" ] || [ "$SES6" ] || [ "$SES7" ] ;
then
NORMAL_OPERATION=""
fi
if [ "$FULL" ] || [ "$NORMAL_OPERATION" ] ; then
- [ "$FULL" ] && MAKECHECK="--makecheck"
+ if [ "$FULL" ] ; then
+ CAASP4="--caasp4"
+ MAKECHECK="--makecheck"
+ fi
NAUTILUS="--nautilus"
OCTOPUS="--octopus"
PACIFIC="--pacific"
@@ -219,7 +224,8 @@
run_cmd sesdev destroy --non-interactive ses7-1node
run_cmd sesdev create ses7 --non-interactive $CEPH_SALT_FROM_SOURCE
ses7-4node
run_cmd sesdev qa-test ses7-4node
- run_cmd test_tunnel ses7-4node
+ # revert back to default test_tunnel arguments after bsc#1170498 is fixed
+ run_cmd test_tunnel ses7-4node dashboard https 8443 "JavaScript required"
# uncomment when https://github.com/SUSE/sesdev/issues/276 is fixed
# run_cmd tunnel_gone
run_cmd sesdev destroy --non-interactive ses7-4node
@@ -245,4 +251,9 @@
run_cmd sesdev destroy --non-interactive makecheck_sles-15-sp2
fi
+if [ "$CAASP4" ] ; then
+ run_cmd sesdev create caasp4 --non-interactive caasp4_default
+ run_cmd sesdev destroy --non-interactive caasp4_default
+fi
+
final_report
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sesdev-1.1.11+1587722868.gc7e5625/sesdev.spec
new/sesdev-1.1.12+1588084576.g8b2afa1/sesdev.spec
--- old/sesdev-1.1.11+1587722868.gc7e5625/sesdev.spec 2020-04-24
12:07:48.892052647 +0200
+++ new/sesdev-1.1.12+1588084576.g8b2afa1/sesdev.spec 2020-04-28
16:36:16.712270560 +0200
@@ -16,7 +16,7 @@
#
Name: sesdev
-Version: 1.1.11+1587722868.gc7e5625
+Version: 1.1.12+1588084576.g8b2afa1
Release: 1%{?dist}
Summary: CLI tool to deploy and manage SES clusters
License: MIT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sesdev-1.1.11+1587722868.gc7e5625/seslib/__init__.py
new/sesdev-1.1.12+1588084576.g8b2afa1/seslib/__init__.py
--- old/sesdev-1.1.11+1587722868.gc7e5625/seslib/__init__.py 2020-04-24
12:07:48.584052902 +0200
+++ new/sesdev-1.1.12+1588084576.g8b2afa1/seslib/__init__.py 2020-04-28
16:36:16.412270726 +0200
@@ -1435,9 +1435,11 @@
if node and node not in self.nodes:
raise NodeDoesNotExist(node)
if node:
+ log_handler("Stopping node {} of deployment {}\n".format(node,
self.dep_id))
self._stop(node)
else:
for _node in self.nodes:
+ log_handler("Stopping node {} of deployment
{}\n".format(_node, self.dep_id))
self._stop(_node)
def start(self, log_handler, node=None):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sesdev-1.1.11+1587722868.gc7e5625/seslib/templates/caasp/loadbalancer.sh.j2
new/sesdev-1.1.12+1588084576.g8b2afa1/seslib/templates/caasp/loadbalancer.sh.j2
---
old/sesdev-1.1.11+1587722868.gc7e5625/seslib/templates/caasp/loadbalancer.sh.j2
2020-04-24 12:07:48.584052902 +0200
+++
new/sesdev-1.1.12+1588084576.g8b2afa1/seslib/templates/caasp/loadbalancer.sh.j2
2020-04-28 16:36:16.412270726 +0200
@@ -1,4 +1,5 @@
-zypper -n install nginx
+
+zypper --non-interactive install nginx
cat > /etc/nginx/nginx.conf << EOF
user nginx;
@@ -56,4 +57,4 @@
systemctl enable --now nginx
-touch /tmp/ready
\ No newline at end of file
+touch /tmp/ready
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sesdev-1.1.11+1587722868.gc7e5625/seslib/templates/caasp/master.sh.j2
new/sesdev-1.1.12+1588084576.g8b2afa1/seslib/templates/caasp/master.sh.j2
--- old/sesdev-1.1.11+1587722868.gc7e5625/seslib/templates/caasp/master.sh.j2
2020-04-24 12:07:48.584052902 +0200
+++ new/sesdev-1.1.12+1588084576.g8b2afa1/seslib/templates/caasp/master.sh.j2
2020-04-28 16:36:16.412270726 +0200
@@ -1,5 +1,5 @@
-zypper -n in -t pattern SUSE-CaaSP-Management
+zypper --non-interactive install --type pattern SUSE-CaaSP-Management
{% if node.name == 'master1' %}
@@ -21,7 +21,7 @@
printf "\n"
}
-zypper -n in skuba skuba-update
+zypper --non-interactive install skuba skuba-update
touch /tmp/ready
@@ -146,7 +146,7 @@
# deploy and configure rook + Ceph
-zypper -n in rook-k8s-yaml
+zypper --non-interactive install rook-k8s-yaml
cd /usr/share/k8s-yaml/rook/ceph/
{% if node_manager.get_by_role('worker') | length <3 %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sesdev-1.1.11+1587722868.gc7e5625/seslib/templates/caasp/provision.sh.j2
new/sesdev-1.1.12+1588084576.g8b2afa1/seslib/templates/caasp/provision.sh.j2
---
old/sesdev-1.1.11+1587722868.gc7e5625/seslib/templates/caasp/provision.sh.j2
2020-04-24 12:07:48.584052902 +0200
+++
new/sesdev-1.1.12+1588084576.g8b2afa1/seslib/templates/caasp/provision.sh.j2
2020-04-28 16:36:16.412270726 +0200
@@ -9,10 +9,9 @@
cp -r /root/.ssh/ /home/sles/
chown -R sles:users /home/sles/.ssh/
-zypper -n install cri-o-kubeadm-criconfig kubernetes-kubeadm
kubernetes-kubelet \
- kubernetes-client podman SUSEConnect nfs-client
+zypper --non-interactive install cri-o-kubeadm-criconfig kubernetes-kubeadm
kubernetes-kubelet kubernetes-client podman SUSEConnect nfs-client
-zypper -n install -t pattern SUSE-CaaSP-Node
+zypper --non-interactive install --type pattern SUSE-CaaSP-Node
{% if node.has_role('master') %}
{% include "caasp/master.sh.j2" %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sesdev-1.1.11+1587722868.gc7e5625/seslib/templates/caasp/storage.sh.j2
new/sesdev-1.1.12+1588084576.g8b2afa1/seslib/templates/caasp/storage.sh.j2
--- old/sesdev-1.1.11+1587722868.gc7e5625/seslib/templates/caasp/storage.sh.j2
2020-04-24 12:07:48.584052902 +0200
+++ new/sesdev-1.1.12+1588084576.g8b2afa1/seslib/templates/caasp/storage.sh.j2
2020-04-28 16:36:16.412270726 +0200
@@ -1,8 +1,9 @@
-zypper -n in nfs-kernel-server
+
+zypper --non-interactive install nfs-kernel-server
mkdir /nfs
echo '/nfs *.{{ domain }}(rw,no_root_squash)' >/etc/exports
systemctl enable --now nfs-server
exportfs -a
-touch /tmp/ready
\ No newline at end of file
+touch /tmp/ready
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sesdev-1.1.11+1587722868.gc7e5625/seslib/templates/ceph-salt/ceph_salt_deployment.sh.j2
new/sesdev-1.1.12+1588084576.g8b2afa1/seslib/templates/ceph-salt/ceph_salt_deployment.sh.j2
---
old/sesdev-1.1.11+1587722868.gc7e5625/seslib/templates/ceph-salt/ceph_salt_deployment.sh.j2
2020-04-24 12:07:48.584052902 +0200
+++
new/sesdev-1.1.12+1588084576.g8b2afa1/seslib/templates/ceph-salt/ceph_salt_deployment.sh.j2
2020-04-28 16:36:16.412270726 +0200
@@ -6,7 +6,7 @@
cd /root
git clone {{ ceph_salt_git_repo }}
cd ceph-salt
-zypper -n in autoconf gcc python3-devel python3-pip python3-curses
+zypper --non-interactive install autoconf gcc python3-devel python3-pip
python3-curses
{% if ceph_salt_fetch_github_pr_heads %}
# fetch the available PRs (HEAD) from github. With that,
"ceph_salt_git_branch" can be something like "origin/pr/127" to checkout a
github PR
@@ -25,7 +25,7 @@
chown -R salt:salt /srv
{% else %}
# ceph-salt-formula is installed automatically as a dependency of ceph-salt
-zypper -n in ceph-salt
+zypper --non-interactive install ceph-salt
{% endif %}
systemctl restart salt-master
@@ -70,7 +70,8 @@
ceph-salt config /containers/images/ceph set {{ image_path }}
{% endif %}
ceph-salt config /time_server/server_hostname set {{ master.fqdn }}
-ceph-salt config /time_server/external_servers add 0.pt.pool.ntp.org
+{% set external_timeserver = "pool.ntp.org" %}
+ceph-salt config /time_server/external_servers add {{ external_timeserver }}
{% if ceph_salt_deploy_osds %}
{% if storage_nodes < 3 %}
@@ -86,7 +87,7 @@
ceph-salt export --pretty
ceph-salt status
-zypper lr -upEP
+zypper repos -upEP
zypper info cephadm | grep -E '(^Repo|^Version)'
ceph-salt --version
@@ -97,18 +98,61 @@
{% if use_salt %}
salt -G 'ceph-salt:member' state.apply ceph-salt
{% else %}
-stdbuf -o0 ceph-salt -ldebug deploy --non-interactive
+stdbuf -o0 ceph-salt -ldebug apply --non-interactive
{% endif %}
{% if ceph_salt_deploy_mons %}
{% if mon_nodes > 1 %}
TIME_SERVER="$(ceph-salt export | jq -r .time_server.server_host)"
-salt "$TIME_SERVER" cmd.run 'bash -c "chronyc makestep && chronyc waitsync"'
-{% for node in nodes %}
-if [ "{{ node.fqdn }}" != "$TIME_SERVER" ] ; then
- salt "{{ node.fqdn }}" cmd.run 'bash -c "chronyc makestep && chronyc
waitsync"'
+{% set chrony_script = "chrony_sync_start.sh" %}
+cat > /root/{{ chrony_script }} << 'EOF'
+#!/bin/bash
+
+set -x
+
+function try_wait {
+ local cmd="$1"
+ local tries="$2"
+ local sleep_secs="$3"
+ set +x
+ for i in $(seq 1 "$tries") ; do
+ set -x
+ $cmd
+ set +x
+ SAVED_STATUS="$?"
+ test "$SAVED_STATUS" = "0" && break
+ set -x
+ sleep "$sleep_secs"
+ set +x
+ done
+ set -x
+}
+
+chronyc 'burst 4/4'
+sleep 15
+chronyc makestep
+stdbuf -o0 chronyc waitsync 30 0.04
+try_wait "chronyc -n sources" 10 5
+systemctl status --lines 20 chronyd.service | grep stepped
+chronyc tracking
+EOF
+chmod 755 /root/{{ chrony_script }}
+{% for _node in nodes %}
+{% if _node != master %}
+scp -o StrictHostKeyChecking=no /root/{{ chrony_script }} {{ _node.name }}:
+{% endif %}
+{% endfor %}
+{% for _node in nodes %}
+if [ "{{ _node.fqdn }}" == "$TIME_SERVER" ] ; then
+ ssh -o StrictHostKeyChecking=no {{ _node.name }} ./{{ chrony_script }}
+fi
+{% endfor %}
+{% for _node in nodes %}
+if [ "{{ _node.fqdn }}" != "$TIME_SERVER" ] ; then
+ ssh -o StrictHostKeyChecking=no {{ _node.name }} ./{{ chrony_script }} &
fi
{% endfor %}
+wait
ceph orch apply mon "$MON_NODES_COMMA_SEPARATED_LIST"
{% endif %} {# mon_nodes > 1 #}
{% endif %} {# ceph_salt_deploy_mons #}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sesdev-1.1.11+1587722868.gc7e5625/seslib/templates/deepsea/deepsea_deployment.sh.j2
new/sesdev-1.1.12+1588084576.g8b2afa1/seslib/templates/deepsea/deepsea_deployment.sh.j2
---
old/sesdev-1.1.11+1587722868.gc7e5625/seslib/templates/deepsea/deepsea_deployment.sh.j2
2020-04-24 12:07:48.584052902 +0200
+++
new/sesdev-1.1.12+1588084576.g8b2afa1/seslib/templates/deepsea/deepsea_deployment.sh.j2
2020-04-28 16:36:16.412270726 +0200
@@ -6,9 +6,9 @@
make install
{% else %}
{% if version == 'ses5' %}
-zypper -n install deepsea
+zypper --non-interactive install deepsea
{% else %}
-zypper -n install deepsea deepsea-cli
+zypper --non-interactive install deepsea deepsea-cli
{% endif %}
{% endif %}
deepsea --version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sesdev-1.1.11+1587722868.gc7e5625/seslib/templates/deepsea/ses5_pre_stage_0.sh.j2
new/sesdev-1.1.12+1588084576.g8b2afa1/seslib/templates/deepsea/ses5_pre_stage_0.sh.j2
---
old/sesdev-1.1.11+1587722868.gc7e5625/seslib/templates/deepsea/ses5_pre_stage_0.sh.j2
2020-04-24 12:07:48.584052902 +0200
+++
new/sesdev-1.1.12+1588084576.g8b2afa1/seslib/templates/deepsea/ses5_pre_stage_0.sh.j2
2020-04-28 16:36:16.412270726 +0200
@@ -6,7 +6,7 @@
echo "$uuid $partial" > /etc/fstab
fi
-zypper -n install SuSEfirewall2
+zypper --non-interactive install SuSEfirewall2
SuSEfirewall2 off
sed -i 's/#worker_threads: 5/worker_threads: 10/g' /etc/salt/master
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sesdev-1.1.11+1587722868.gc7e5625/seslib/templates/provision.sh.j2
new/sesdev-1.1.12+1588084576.g8b2afa1/seslib/templates/provision.sh.j2
--- old/sesdev-1.1.11+1587722868.gc7e5625/seslib/templates/provision.sh.j2
2020-04-24 12:07:48.588052899 +0200
+++ new/sesdev-1.1.12+1588084576.g8b2afa1/seslib/templates/provision.sh.j2
2020-04-28 16:36:16.416270725 +0200
@@ -13,14 +13,18 @@
{% endif %}
{% endfor %}
+# do not exclude documentation files when installing RPM packages
sed -i 's/^rpm\.install\.excludedocs.*$/# rpm.install.excludedocs = no/'
/etc/zypp/zypp.conf
+# enable autorefresh on all zypper repos
+find /etc/zypp/repos.d -type f -exec sed -i -e
's/^autorefresh=.*/autorefresh=1/' {} \;
+
# remove "which" RPM because testing environments typically don't have it
installed
-zypper -n rm which || true
+zypper --non-interactive remove which || true
# remove Python 2 so it doesn't pollute the environment
{% if os != 'sles-12-sp3' %}
-zypper -n rm python-base || true
+zypper --non-interactive remove python-base || true
{% endif %}
# remove Non-OSS repos in openSUSE
@@ -33,11 +37,11 @@
{% endif %}
{% for os_repo_name, os_repo_url in os_base_repos %}
-zypper addrepo {{ os_repo_url }} {{ os_repo_name }}
+zypper addrepo --refresh {{ os_repo_url }} {{ os_repo_name }}
{% endfor %}
{% for _repo in version_repos_prio %}
-zypper addrepo
+zypper addrepo --refresh
{%- if _repo.priority %}
--priority {{ _repo.priority }}
{%- elif repo_priority %}
@@ -76,9 +80,9 @@
'command-not-found',
] %}
{% if os == 'sles-12-sp3' %}
-zypper -n install {{ basic_pkgs_to_install | join(' ') }} ntp
+zypper --non-interactive install {{ basic_pkgs_to_install | join(' ') }} ntp
{% else %}
-zypper -n install {{ basic_pkgs_to_install | join(' ') }} chrony hostname
+zypper --non-interactive install {{ basic_pkgs_to_install | join(' ') }}
chrony hostname
{% endif %}
{% if os.startswith("sle") %}
@@ -87,13 +91,13 @@
'supportutils',
'supportutils-plugin-ses',
] %}
-zypper -n install {{ sle_pkgs_to_install | join(' ') }}
+zypper --non-interactive install {{ sle_pkgs_to_install | join(' ') }}
{% endif %}
{% for repo in node.repos %}
-zypper ar {{ repo.url }} {{ repo.name }}
+zypper addrepo --refresh {{ repo.url }} {{ repo.name }}
{% if repo_priority and repo.priority %}
-zypper mr -p {{ repo.priority }} {{ repo.name }}
+zypper modifyrepo --priority {{ repo.priority }} {{ repo.name }}
{% endif %}
{% endfor %}
{% if node.repos|length > 0 %}
@@ -111,10 +115,12 @@
{% if version == 'caasp4' %}
{% include "caasp/provision.sh.j2" %}
-{% elif version == 'makecheck' %}
+{% endif %}
+
+{% if version == 'makecheck' %}
{% include "makecheck/provision.sh.j2" %}
{% elif not suma %}
-zypper -n install salt-minion
+zypper --non-interactive install salt-minion
sed -i 's/^#master:.*/master: {{ master.name }}/g' /etc/salt/minion
# change salt log level to info
@@ -134,7 +140,7 @@
{% if node == master or node == suma %}
{% if node == master %}
-zypper -n install salt-master
+zypper --non-interactive install salt-master
sed -i 's/^#log_level: warning/log_level: info/g' /etc/salt/master
systemctl enable salt-master
systemctl start salt-master
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sesdev-1.1.11+1587722868.gc7e5625/seslib/templates/suma/suma_deployment.sh.j2
new/sesdev-1.1.12+1588084576.g8b2afa1/seslib/templates/suma/suma_deployment.sh.j2
---
old/sesdev-1.1.11+1587722868.gc7e5625/seslib/templates/suma/suma_deployment.sh.j2
2020-04-24 12:07:48.588052899 +0200
+++
new/sesdev-1.1.12+1588084576.g8b2afa1/seslib/templates/suma/suma_deployment.sh.j2
2020-04-28 16:36:16.416270725 +0200
@@ -1,8 +1,9 @@
+
systemctl stop firewalld
sed -i 's/^.*onlyRequires = true$/solver.onlyRequires = false/g'
/etc/zypp/zypp.conf
-zypper -n in xfsprogs
+zypper --non-interactive install xfsprogs
SW_DEV=`lsblk --nodeps -o name,size | grep ^vd | grep 101G | head -1 | cut -d'
' -f1`
PG_DEV=`lsblk --nodeps -o name,size | grep ^vd | grep 51G | head -1 | cut -d'
' -f1`
@@ -17,7 +18,7 @@
mount /var/spacewalk
mount /var/lib/pgsql
-zypper -n in -t pattern uyuni_server
+zypper --non-interactive install --type pattern uyuni_server
cat > /root/setup_env.sh <<EOF
MANAGER_FORCE_INSTALL='0'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sesdev-1.1.11+1587722868.gc7e5625/seslib/templates/sync_clocks.sh.j2
new/sesdev-1.1.12+1588084576.g8b2afa1/seslib/templates/sync_clocks.sh.j2
--- old/sesdev-1.1.11+1587722868.gc7e5625/seslib/templates/sync_clocks.sh.j2
2020-04-24 12:07:48.588052899 +0200
+++ new/sesdev-1.1.12+1588084576.g8b2afa1/seslib/templates/sync_clocks.sh.j2
2020-04-28 16:36:16.416270725 +0200
@@ -97,9 +97,12 @@
}
systemctl start chronyd.service
+sleep 15
chronyc makestep
+chronyc 'burst 4/4'
stdbuf -o0 chronyc waitsync
try_wait "chronyc -n sources" 10 5
+systemctl status --lines 20 chronyd.service | grep stepped
EOF
chmod 755 {{ chrony_script }}
./{{ chrony_script }}
