Hello community,
here is the log from the commit of package caasp-container-manifests for
openSUSE:Factory checked in at 2018-05-10 15:48:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/caasp-container-manifests (Old)
and /work/SRC/openSUSE:Factory/.caasp-container-manifests.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "caasp-container-manifests"
Thu May 10 15:48:58 2018 rev:8 rq:605316 version:4.0.0+git_r278_3f83899
Changes:
--------
---
/work/SRC/openSUSE:Factory/caasp-container-manifests/caasp-container-manifests.changes
2018-04-24 15:33:24.853603893 +0200
+++
/work/SRC/openSUSE:Factory/.caasp-container-manifests.new/caasp-container-manifests.changes
2018-05-10 15:49:12.829673061 +0200
@@ -1,0 +2,14 @@
+Tue May 8 10:41:05 UTC 2018 - [email protected]
+
+- Commit c0644aa by Jordi Massaguer Pla [email protected]
+ update version to 4.0.0+dev
+
+
+-------------------------------------------------------------------
+Mon May 7 19:55:14 UTC 2018 - [email protected]
+
+- Commit 73a51a2 by Thorsten Kukuk [email protected]
+ Run activate.sh from admin-node-init.service during the first boot
+
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ caasp-container-manifests.spec ++++++
--- /var/tmp/diff_new_pack.agZilD/_old 2018-05-10 15:49:13.773638464 +0200
+++ /var/tmp/diff_new_pack.agZilD/_new 2018-05-10 15:49:13.777638317 +0200
@@ -29,7 +29,7 @@
%endif
Name: caasp-container-manifests
-Version: 3.0.0+git_r274_c9dd4f7
+Version: 4.0.0+git_r278_3f83899
Release: 0
Summary: Manifest file templates for containers on controller node
License: Apache-2.0
@@ -93,20 +93,22 @@
mkdir -p %{buildroot}/%{_unitdir}
install -D -m 0644 admin-node-setup.service %{buildroot}/%{_unitdir}/
sed -e "s#__ADMIN_NODE_SETUP_PATH__#%{_datadir}/%{name}#" -i
%{buildroot}/%{_unitdir}/admin-node-setup.service
+install -D -m 0644 admin-node-init.service %{buildroot}/%{_unitdir}/
+sed -e "s#__ADMIN_NODE_SETUP_PATH__#%{_datadir}/%{name}#" -i
%{buildroot}/%{_unitdir}/admin-node-init.service
mkdir -p %{buildroot}/%{_sbindir}
ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcadmin-node-setup
%pre
-%service_add_pre admin-node-setup.service
+%service_add_pre admin-node-setup.service admin-node-init.service
%post
-%service_add_post admin-node-setup.service
+%service_add_post admin-node-setup.service admin-node-init.service
%preun
-%service_del_preun admin-node-setup.service
+%service_del_preun admin-node-setup.service admin-node-init.service
%postun
-%service_del_postun admin-node-setup.service
+%service_del_postun admin-node-setup.service admin-node-init.service
%files
%defattr(-,root,root)
@@ -117,6 +119,7 @@
%dir /etc/caasp/haproxy
%config(noreplace) /etc/caasp/haproxy/haproxy.cfg
%{_sbindir}/rcadmin-node-setup
+%{_unitdir}/admin-node-init.service
%{_unitdir}/admin-node-setup.service
%{_datadir}/%{name}/*
++++++ master.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caasp-container-manifests-master/VERSION
new/caasp-container-manifests-master/VERSION
--- old/caasp-container-manifests-master/VERSION 2018-04-23
10:27:23.000000000 +0200
+++ new/caasp-container-manifests-master/VERSION 2018-05-08
12:42:26.000000000 +0200
@@ -1 +1 @@
-3.0.0+dev
+4.0.0+dev
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caasp-container-manifests-master/activate.sh
new/caasp-container-manifests-master/activate.sh
--- old/caasp-container-manifests-master/activate.sh 2018-04-23
10:27:23.000000000 +0200
+++ new/caasp-container-manifests-master/activate.sh 2018-05-08
12:42:26.000000000 +0200
@@ -3,6 +3,11 @@
# this script WILL BE RUN ONLY ONCE, after the installation
# this script WILL NOT RUN during/after upgrades
+DIDRUNFILE=/var/lib/misc/caasp-admin-node-init-did-run
+
+# Don't run this script a second time
+test -f ${DIDRUNFILE} && exit 0
+
# Make sure that the controller node looks for the local pause image
# TODO: remove this as soon as possible. As an idea, we could use a systemd
drop-in unit.
if ! grep "pod-infra-container-image" /etc/kubernetes/kubelet &> /dev/null;
then
@@ -32,3 +37,6 @@
# Disable swap
# On ISO-based installs the script runs in a chroot and then the system is
rebooted
sed -i '/^#/! {/ swap / s/^/#/}' /etc/fstab
+
+# Mark that the script did run
+touch ${DIDRUNFILE}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/caasp-container-manifests-master/admin-node-init.service
new/caasp-container-manifests-master/admin-node-init.service
--- old/caasp-container-manifests-master/admin-node-init.service
1970-01-01 01:00:00.000000000 +0100
+++ new/caasp-container-manifests-master/admin-node-init.service
2018-05-08 12:42:26.000000000 +0200
@@ -0,0 +1,14 @@
+[Unit]
+Description=Initialize Administration Node
+Conflicts=shutdown.target
+After=local-fs.target
+Before=admin-node-setup.service
+ConditionPathExists=!/var/lib/misc/caasp-admin-node-init-did-run
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=__ADMIN_NODE_SETUP_PATH__/activate.sh
+
+[Install]
+WantedBy=multi-user.target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/caasp-container-manifests-master/packaging/suse/make_spec.sh
new/caasp-container-manifests-master/packaging/suse/make_spec.sh
--- old/caasp-container-manifests-master/packaging/suse/make_spec.sh
2018-04-23 10:27:23.000000000 +0200
+++ new/caasp-container-manifests-master/packaging/suse/make_spec.sh
2018-05-08 12:42:26.000000000 +0200
@@ -114,20 +114,22 @@
mkdir -p %{buildroot}/%{_unitdir}
install -D -m 0644 admin-node-setup.service %{buildroot}/%{_unitdir}/
sed -e "s#__ADMIN_NODE_SETUP_PATH__#%{_datadir}/%{name}#" -i
%{buildroot}/%{_unitdir}/admin-node-setup.service
+install -D -m 0644 admin-node-init.service %{buildroot}/%{_unitdir}/
+sed -e "s#__ADMIN_NODE_SETUP_PATH__#%{_datadir}/%{name}#" -i
%{buildroot}/%{_unitdir}/admin-node-init.service
mkdir -p %{buildroot}/%{_sbindir}
ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcadmin-node-setup
%pre
-%service_add_pre admin-node-setup.service
+%service_add_pre admin-node-setup.service admin-node-init.service
%post
-%service_add_post admin-node-setup.service
+%service_add_post admin-node-setup.service admin-node-init.service
%preun
-%service_del_preun admin-node-setup.service
+%service_del_preun admin-node-setup.service admin-node-init.service
%postun
-%service_del_postun admin-node-setup.service
+%service_del_postun admin-node-setup.service admin-node-init.service
%files
%defattr(-,root,root)
@@ -138,6 +140,7 @@
%dir /etc/caasp/haproxy
%config(noreplace) /etc/caasp/haproxy/haproxy.cfg
%{_sbindir}/rcadmin-node-setup
+%{_unitdir}/admin-node-init.service
%{_unitdir}/admin-node-setup.service
%{_datadir}/%{name}/*
%changelog
