Hello community,
here is the log from the commit of package caasp-container-manifests for
openSUSE:Factory checked in at 2018-03-19 23:37:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/caasp-container-manifests (Old)
and /work/SRC/openSUSE:Factory/.caasp-container-manifests.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "caasp-container-manifests"
Mon Mar 19 23:37:51 2018 rev:3 rq:587878 version:3.0.0+git_r260_831e0be
Changes:
--------
---
/work/SRC/openSUSE:Factory/caasp-container-manifests/caasp-container-manifests.changes
2018-03-06 10:49:28.775533866 +0100
+++
/work/SRC/openSUSE:Factory/.caasp-container-manifests.new/caasp-container-manifests.changes
2018-03-19 23:37:51.902464088 +0100
@@ -1,0 +2,14 @@
+Thu Mar 15 17:07:22 UTC 2018 - [email protected]
+
+- Commit a90b497 by Richard Brown [email protected]
+ Remove Kubic workaround, caasp-tools no longer conflicts
+
+
+-------------------------------------------------------------------
+Wed Mar 14 11:41:38 UTC 2018 - [email protected]
+
+- Commit 6103539 by Richard Brown [email protected]
+ Change manifest __TAG__'s for Kubic also
+
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ caasp-container-manifests.spec ++++++
--- /var/tmp/diff_new_pack.7olimL/_old 2018-03-19 23:37:52.678436096 +0100
+++ /var/tmp/diff_new_pack.7olimL/_new 2018-03-19 23:37:52.682435951 +0100
@@ -29,7 +29,7 @@
%endif
Name: caasp-container-manifests
-Version: 3.0.0+git_r256_2ce2854
+Version: 3.0.0+git_r260_831e0be
Release: 0
Summary: Manifest file templates for containers on controller node
License: Apache-2.0
++++++ master.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caasp-container-manifests-master/admin-node-setup.sh
new/caasp-container-manifests-master/admin-node-setup.sh
--- old/caasp-container-manifests-master/admin-node-setup.sh 2018-02-27
15:13:49.000000000 +0100
+++ new/caasp-container-manifests-master/admin-node-setup.sh 2018-03-15
18:07:05.000000000 +0100
@@ -32,7 +32,7 @@
cp $manifest_dir/*.yaml $tmp_dir
-for i in $(ls $images_dir/sles*.tag);do
+for i in $(ls $images_dir/sles*.tag $images_dir/kubic*.tag);do
metadata_file=$(basename $i .tag).metadata
image_name=$(cat $images_dir/$metadata_file | grep \"name\": | cut -d":"
-f2 | cut -d\" -f2)
tag=$(cat $i)
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-02-27 15:13:49.000000000 +0100
+++ new/caasp-container-manifests-master/packaging/suse/make_spec.sh
2018-03-15 18:07:05.000000000 +0100
@@ -78,12 +78,6 @@
Requires: kubernetes-salt
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%if ! 0%{?is_susecaasp}
-# caasp-tools package provides
%{_datadir}/caasp-container-manifests/activate.sh
-# if this is not building for SUSE CaaSP, so both packages can't be installed
-# at the same time.
-Conflicts: caasp-tools
-%endif
%description
Manifest file templates will instruct kubelet service to bring up salt
