Hello community,
here is the log from the commit of package caasp-container-manifests for
openSUSE:Factory checked in at 2018-04-20 17:30:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/caasp-container-manifests (Old)
and /work/SRC/openSUSE:Factory/.caasp-container-manifests.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "caasp-container-manifests"
Fri Apr 20 17:30:34 2018 rev:6 rq:598535 version:3.0.0+git_r272_98378ff
Changes:
--------
---
/work/SRC/openSUSE:Factory/caasp-container-manifests/caasp-container-manifests.changes
2018-04-13 12:52:55.424697230 +0200
+++
/work/SRC/openSUSE:Factory/.caasp-container-manifests.new/caasp-container-manifests.changes
2018-04-20 17:32:55.323028027 +0200
@@ -1,0 +2,16 @@
+Wed Apr 18 08:28:11 UTC 2018 - [email protected]
+
+- Commit ccbb3d7 by Rafael Fernández López [email protected]
+ Add minion reconciler to the event processor.
+
+ Feature#force-remove-nodes
+
+
+-------------------------------------------------------------------
+Mon Apr 16 16:58:20 UTC 2018 - [email protected]
+
+- Commit 2701ede by Thorsten Kukuk [email protected]
+ Fix version number of pause image for SLE15 and Factory
+
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ caasp-container-manifests.spec ++++++
--- /var/tmp/diff_new_pack.mFbAr0/_old 2018-04-20 17:32:55.947005400 +0200
+++ /var/tmp/diff_new_pack.mFbAr0/_new 2018-04-20 17:32:55.947005400 +0200
@@ -29,7 +29,7 @@
%endif
Name: caasp-container-manifests
-Version: 3.0.0+git_r268_9eac836
+Version: 3.0.0+git_r272_98378ff
Release: 0
Summary: Manifest file templates for containers on controller node
License: Apache-2.0
@@ -77,6 +77,10 @@
install -D -m 0755 activate.sh %{buildroot}/%{_datadir}/%{name}/activate.sh
# fix image name in activate
sed -e "s|sles12/pause|%{_base_image}/pause|g" -i
%{buildroot}/%{_datadir}/%{name}/activate.sh
+%if 0%{?suse_version} >= 1500
+# Adjust pause image version in activate
+sed -e "s|pause:1.0.0|pause:0.1|g" -i
%{buildroot}/%{_datadir}/%{name}/activate.sh
+%endif
install -D -m 0755 gen-certs.sh %{buildroot}/%{_datadir}/%{name}/gen-certs.sh
for dir in mysql salt/grains salt/minion.d-ca; do
install -d %{buildroot}/%{_datadir}/%{name}/config/$dir
++++++ master.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/caasp-container-manifests-master/manifests/public.yaml
new/caasp-container-manifests-master/manifests/public.yaml
--- old/caasp-container-manifests-master/manifests/public.yaml 2018-04-12
20:06:11.000000000 +0200
+++ new/caasp-container-manifests-master/manifests/public.yaml 2018-04-18
10:28:53.000000000 +0200
@@ -402,6 +402,8 @@
env:
- name: WORKER_ID
value: worker1
+ - name: SALT_MINION_RECONCILER
+ value: "true"
- name: RAILS_ENV
value: production
- name: VELUM_SECRETS_DIR
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-12 20:06:11.000000000 +0200
+++ new/caasp-container-manifests-master/packaging/suse/make_spec.sh
2018-04-18 10:28:53.000000000 +0200
@@ -98,6 +98,10 @@
install -D -m 0755 activate.sh %{buildroot}/%{_datadir}/%{name}/activate.sh
# fix image name in activate
sed -e "s|sles12/pause|%{_base_image}/pause|g" -i
%{buildroot}/%{_datadir}/%{name}/activate.sh
+%if 0%{?suse_version} >= 1500
+# Adjust pause image version in activate
+sed -e "s|pause:1.0.0|pause:0.1|g" -i
%{buildroot}/%{_datadir}/%{name}/activate.sh
+%endif
install -D -m 0755 gen-certs.sh %{buildroot}/%{_datadir}/%{name}/gen-certs.sh
for dir in mysql salt/grains salt/minion.d-ca; do
install -d %{buildroot}/%{_datadir}/%{name}/config/\$dir
