subject:"commit caasp\-container\-manifests for openSUSE\:Factory"

commit caasp-container-manifests for openSUSE:Factory

2018-10-22 Thread root

Hello community,

here is the log from the commit of package caasp-container-manifests for 
openSUSE:Factory checked in at 2018-10-22 11:22:39

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 Oct 22 11:22:39 2018 rev:20 rq:642970 version:4.0.0+git_r324_f124eb9

Changes:

--- 
/work/SRC/openSUSE:Factory/caasp-container-manifests/caasp-container-manifests.changes
  2018-10-18 15:30:56.218673066 +0200
+++ 
/work/SRC/openSUSE:Factory/.caasp-container-manifests.new/caasp-container-manifests.changes
 2018-10-22 11:22:42.263194445 +0200
@@ -1,0 +2,26 @@
+Thu Oct 11 13:48:33 UTC 2018 - containers-bugow...@suse.de
+
+- Commit 07cb68b by Jordi Massaguer Pla jmassaguer...@suse.de
+ Use 3.0 images instead of head images
+ 
+ Because the images from head will be removed to avoid duplications. The ones
+ we are using is the ones from 3.0 project, cause those ones cannot be
+ removed.
+ 
+ Signed-off-by: Jordi Massaguer Pla 
+
+
+---
+Tue Oct  9 16:07:40 UTC 2018 - containers-bugow...@suse.de
+
+- Commit 07cb68b by Jordi Massaguer Pla jmassaguer...@suse.de
+ Use 3.0 images instead of head images
+ 
+ Because the images from head will be removed to avoid duplications. The ones
+ we are using is the ones from 3.0 project, cause those ones cannot be
+ removed.
+ 
+ Signed-off-by: Jordi Massaguer Pla 
+
+
+---



Other differences:
--
++ caasp-container-manifests.spec ++
--- /var/tmp/diff_new_pack.5mVdq5/_old  2018-10-22 11:22:43.939192753 +0200
+++ /var/tmp/diff_new_pack.5mVdq5/_new  2018-10-22 11:22:43.943192748 +0200
@@ -22,7 +22,7 @@
 
 %if 0%{?suse_version} == 1500 && !0%{?is_opensuse}
   # Use the sles12 images from the registry
-  %define _base_image 
registry.suse.de/devel/casp/head/controllernode/images_container_base/sles12
+  %define _base_image 
registry.suse.de/devel/casp/3.0/controllernode/images_container_base/sles12
 %endif
 
 %if 0%{?is_opensuse} && 0%{?suse_version} > 1500
@@ -30,7 +30,7 @@
 %endif
 
 Name:   caasp-container-manifests
-Version:4.0.0+git_r322_5be82bf
+Version:4.0.0+git_r324_f124eb9
 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/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-09-25 13:41:11.0 +0200
+++ new/caasp-container-manifests-master/packaging/suse/make_spec.sh
2018-10-09 18:11:20.0 +0200
@@ -43,7 +43,7 @@
 
 %if 0%{?suse_version} == 1500 && !0%{?is_opensuse}
   # Use the sles12 images from the registry
-  %define _base_image 
registry.suse.de/devel/casp/head/controllernode/images_container_base/sles12
+  %define _base_image 
registry.suse.de/devel/casp/3.0/controllernode/images_container_base/sles12
 %endif
 
 %if 0%{?is_opensuse} && 0%{?suse_version} > 1500

commit caasp-container-manifests for openSUSE:Factory

2018-10-18 Thread root

Hello community,

here is the log from the commit of package caasp-container-manifests for 
openSUSE:Factory checked in at 2018-10-18 15:30:53

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 Oct 18 15:30:53 2018 rev:19 rq:639584 version:4.0.0+git_r322_5be82bf

Changes:

--- 
/work/SRC/openSUSE:Factory/caasp-container-manifests/caasp-container-manifests.changes
  2018-08-02 14:56:55.664154920 +0200
+++ 
/work/SRC/openSUSE:Factory/.caasp-container-manifests.new/caasp-container-manifests.changes
 2018-10-18 15:30:56.218673066 +0200
@@ -1,0 +2,25 @@
+Tue Sep 25 11:37:29 UTC 2018 - containers-bugow...@suse.de
+
+- Commit 74fdaab by Jordi Massaguer Pla jmassaguer...@suse.de
+ use the sles12 images from registry.suse.de
+ 
+ This is a first step towards using the registry. We will use an internal one
+ in registry.suse.de Later, we will use the registry.suse.com for caasp and
+ registry.opensuse.org for kubic, however, we have to figure out the tagging
+ strategy if we want to use kubic images or images based on sle15.
+ 
+ Thus, for now, we start using the sles12 images which have a fixed tag.
+ 
+ Signed-off-by: Jordi Massaguer Pla 
+
+
+---
+Tue Sep 25 09:24:00 UTC 2018 - containers-bugow...@suse.de
+
+- Commit 1bebec5 by Vicente Zepeda Mas vzepeda...@suse.com
+ Fix bsc#1099045 adds annotation to use docker/default seccomp profile
+ 
+ Signed-off-by: Vicente Zepeda Mas 
+
+
+---



Other differences:
--
++ caasp-container-manifests.spec ++
--- /var/tmp/diff_new_pack.rsqT9M/_old  2018-10-18 15:30:56.822672361 +0200
+++ /var/tmp/diff_new_pack.rsqT9M/_new  2018-10-18 15:30:56.826672356 +0200
@@ -21,7 +21,8 @@
 %endif
 
 %if 0%{?suse_version} == 1500 && !0%{?is_opensuse}
-  %define _base_image caasp
+  # Use the sles12 images from the registry
+  %define _base_image 
registry.suse.de/devel/casp/head/controllernode/images_container_base/sles12
 %endif
 
 %if 0%{?is_opensuse} && 0%{?suse_version} > 1500
@@ -29,7 +30,7 @@
 %endif
 
 Name:   caasp-container-manifests
-Version:4.0.0+git_r318_46eddba
+Version:4.0.0+git_r322_5be82bf
 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/manifests/haproxy.yaml 
new/caasp-container-manifests-master/manifests/haproxy.yaml
--- old/caasp-container-manifests-master/manifests/haproxy.yaml 2018-07-23 
10:45:08.0 +0200
+++ new/caasp-container-manifests-master/manifests/haproxy.yaml 2018-09-25 
13:41:11.0 +0200
@@ -8,6 +8,7 @@
 name: haproxy
   annotations:
 scheduler.alpha.kubernetes.io/critical-pod: ''
+seccomp.security.alpha.kubernetes.io/pod: docker/default
 spec:
   restartPolicy: Always
   hostNetwork: true
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-07-23 10:45:08.0 +0200
+++ new/caasp-container-manifests-master/packaging/suse/make_spec.sh
2018-09-25 13:41:11.0 +0200
@@ -42,7 +42,8 @@
 %endif
 
 %if 0%{?suse_version} == 1500 && !0%{?is_opensuse}
-  %define _base_image caasp
+  # Use the sles12 images from the registry
+  %define _base_image 
registry.suse.de/devel/casp/head/controllernode/images_container_base/sles12
 %endif
 
 %if 0%{?is_opensuse} && 0%{?suse_version} > 1500

commit caasp-container-manifests for openSUSE:Factory

2018-08-02 Thread root

Hello community,

here is the log from the commit of package caasp-container-manifests for 
openSUSE:Factory checked in at 2018-08-02 14:56:53

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 Aug  2 14:56:53 2018 rev:18 rq:624693 version:4.0.0+git_r318_46eddba

Changes:

--- 
/work/SRC/openSUSE:Factory/caasp-container-manifests/caasp-container-manifests.changes
  2018-07-13 10:21:34.758471819 +0200
+++ 
/work/SRC/openSUSE:Factory/.caasp-container-manifests.new/caasp-container-manifests.changes
 2018-08-02 14:56:55.664154920 +0200
@@ -1,0 +2,13 @@
+Mon Jul 23 08:42:55 UTC 2018 - containers-bugow...@suse.de
+
+- Commit 5b6cfa2 by Maximilian Meister mmeis...@suse.de
+ re-introduce config flag
+ 
+ with the kubelet-config.yaml we need it again
+ 
+ kubelet#config
+ 
+ Signed-off-by: Maximilian Meister 
+
+
+---



Other differences:
--
++ caasp-container-manifests.spec ++
--- /var/tmp/diff_new_pack.bAjozU/_old  2018-08-02 14:56:56.312156008 +0200
+++ /var/tmp/diff_new_pack.bAjozU/_new  2018-08-02 14:56:56.316156015 +0200
@@ -29,7 +29,7 @@
 %endif
 
 Name:   caasp-container-manifests
-Version:4.0.0+git_r316_7a19ed1
+Version:4.0.0+git_r318_46eddba
 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.sh2018-07-06 
11:33:33.0 +0200
+++ new/caasp-container-manifests-master/admin-node-setup.sh2018-07-23 
10:45:08.0 +0200
@@ -9,9 +9,6 @@
 # Turn off current swaps if any
 /usr/sbin/swapoff -a
 
-# switch deprecated --config flag in kubelet
-sed -i -e "s/--config=/--pod-manifest-path=/g" /etc/kubernetes/kubelet
-
 # Update manifest files
 kube_dir=/etc/kubernetes/manifests
 manifest_dir=/usr/share/caasp-container-manifests/manifests

commit caasp-container-manifests for openSUSE:Factory

2018-07-13 Thread root

Hello community,

here is the log from the commit of package caasp-container-manifests for 
openSUSE:Factory checked in at 2018-07-13 10:21:31

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 Jul 13 10:21:31 2018 rev:17 rq:622261 version:4.0.0+git_r316_7a19ed1

Changes:

--- 
/work/SRC/openSUSE:Factory/caasp-container-manifests/caasp-container-manifests.changes
  2018-06-22 13:35:33.938245957 +0200
+++ 
/work/SRC/openSUSE:Factory/.caasp-container-manifests.new/caasp-container-manifests.changes
 2018-07-13 10:21:34.758471819 +0200
@@ -1,0 +2,41 @@
+Fri Jul  6 09:32:16 UTC 2018 - containers-bugow...@suse.de
+
+- Commit f23f049 by Maximilian Meister mmeis...@suse.de
+ use 503 error file (bsc#1080636)
+ 
+ Signed-off-by: Maximilian Meister 
+ 
+ Commit 5ceb972 by Maximilian Meister mmeis...@suse.de
+ mount static pages from velum-branding (bsc#1080636)
+ 
+ Signed-off-by: Maximilian Meister 
+
+
+---
+Thu Jul  5 16:20:34 UTC 2018 - containers-bugow...@suse.de
+
+- Commit 79bf8f4 by Alvaro Saurin alvaro.sau...@gmail.com
+ We should generate a random CA serial number. According to the CA/Browser
+ Forum Baseline Requirements section 7.1: "CAs SHOULD generate non‐sequential
+ Certificate serial numbers that exhibit at least 20 bits of entropy.". In
+ general it is considered a good practice to use a random number instead of a
+ constant...
+ 
+ feature#security
+
+
+---
+Tue Jul  3 11:14:09 UTC 2018 - containers-bugow...@suse.de
+
+- Commit 0f2b13b by Maximilian Meister mmeis...@suse.de
+ drop branding mount for images
+ 
+ the images have to be precompiled into the velum rpm, therefore a mount is
+ useless
+ 
+ velum#branding
+ 
+ Signed-off-by: Maximilian Meister 
+
+
+---



Other differences:
--
++ caasp-container-manifests.spec ++
--- /var/tmp/diff_new_pack.a0NyCW/_old  2018-07-13 10:21:35.650472887 +0200
+++ /var/tmp/diff_new_pack.a0NyCW/_new  2018-07-13 10:21:35.650472887 +0200
@@ -29,7 +29,7 @@
 %endif
 
 Name:   caasp-container-manifests
-Version:4.0.0+git_r309_e863888
+Version:4.0.0+git_r316_7a19ed1
 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/config/haproxy/haproxy.cfg 
new/caasp-container-manifests-master/config/haproxy/haproxy.cfg
--- old/caasp-container-manifests-master/config/haproxy/haproxy.cfg 
2018-06-21 08:56:09.0 +0200
+++ new/caasp-container-manifests-master/config/haproxy/haproxy.cfg 
2018-07-06 11:33:33.0 +0200
@@ -22,6 +22,7 @@
 default-server inter 10s fall 3
 balance roundrobin
 server velum unix@/var/run/puma/dashboard.sock
+errorfile 503 /etc/caasp/haproxy/errors/503.html.http
 
 listen velum-api
 bind 127.0.0.1:444 ssl crt /etc/pki/private/velum-bundle.pem ca-file 
/etc/pki/ca.crt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/caasp-container-manifests-master/gen-certs.sh 
new/caasp-container-manifests-master/gen-certs.sh
--- old/caasp-container-manifests-master/gen-certs.sh   2018-06-21 
08:56:09.0 +0200
+++ new/caasp-container-manifests-master/gen-certs.sh   2018-07-06 
11:33:33.0 +0200
@@ -9,11 +9,16 @@
 STATE=${STATE:-Bavaria}
 COUNTRY=${COUNTRY:-DE}
 
-DIR="/etc/pki"
+DIR="${DIR:-/etc/pki}"
 CERTS="$DIR/_certs"
 PRIVATEDIR="$DIR/private"
 WORK="$DIR/_work"
 
+
+random_serial() {
+xxd -l 16 -p /dev/random
+}
+
 genca() {
 [ -f $PRIVATEDIR/ca.key ] && [ -f $DIR/ca.crt ] && return
 
@@ -85,11 +90,16 @@
 keyUsage = critical, nonRepudiation, digitalSignature, keyEncipherment
 EOF
 
+random_serial > $WORK/serial
+
 rm -f $WORK/index.txt $WORK/index.txt.attr
 touch $WORK/index.txt $WORK/index.txt.attr
-echo 1000 > $WORK/serial
 
-openssl req -batch -config $WORK/ca.cfg -sha256 -new -x509 -days 3650 
-extensions v3_ca -key $PRIVATEDIR/ca.key -out $DIR/ca.crt
+openssl req -batch -config $WORK/ca.cfg \
+-sha256 -new -x509 -days 3650 \
+-extensions v3_ca \
+-key $PRIVATEDIR/ca.key \
+-out $DIR/ca.crt
 }
 
 gencert() {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore'

commit caasp-container-manifests for openSUSE:Factory

2018-06-22 Thread root

Hello community,

here is the log from the commit of package caasp-container-manifests for 
openSUSE:Factory checked in at 2018-06-22 13:35:25

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 Jun 22 13:35:25 2018 rev:16 rq:618279 version:4.0.0+git_r309_e863888

Changes:

--- 
/work/SRC/openSUSE:Factory/caasp-container-manifests/caasp-container-manifests.changes
  2018-06-15 14:46:36.787600501 +0200
+++ 
/work/SRC/openSUSE:Factory/.caasp-container-manifests.new/caasp-container-manifests.changes
 2018-06-22 13:35:33.938245957 +0200
@@ -1,0 +2,12 @@
+Thu Jun 21 06:54:33 UTC 2018 - containers-bugow...@suse.de
+
+- Commit fda5fa4 by Florian Bergmann fbergm...@suse.de
+ Fix bsc#1072242: Map the keyboard file into velum container.
+ 
+ Map the keyboard file from the admin node into the valum container to make
+ keyboard defined in YaST available.
+ 
+ Signed-off-by: Florian Bergmann 
+
+
+---



Other differences:
--
++ caasp-container-manifests.spec ++
--- /var/tmp/diff_new_pack.4Imnxo/_old  2018-06-22 13:35:35.106202782 +0200
+++ /var/tmp/diff_new_pack.4Imnxo/_new  2018-06-22 13:35:35.110202634 +0200
@@ -29,7 +29,7 @@
 %endif
 
 Name:   caasp-container-manifests
-Version:4.0.0+git_r307_0f1f0e9
+Version:4.0.0+git_r309_e863888
 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/manifests/public.yaml 
new/caasp-container-manifests-master/manifests/public.yaml
--- old/caasp-container-manifests-master/manifests/public.yaml  2018-06-12 
13:14:45.0 +0200
+++ new/caasp-container-manifests-master/manifests/public.yaml  2018-06-21 
08:56:09.0 +0200
@@ -318,6 +318,9 @@
 - mountPath: /srv/velum/public/favicon.ico
   name: velum-icon
   readOnly: True
+- mountPath: /var/lib/misc/keyboard
+  name: yast-keyboard-configuration
+  readOnly: True
 args: ["bin/run"]
   - name: velum-api
 image: sles12/velum:__TAG__
@@ -595,3 +598,6 @@
   - name: velum-icon
 hostPath:
   path: /usr/share/velum/images/favicon.ico
+  - name: yast-keyboard-configuration
+hostPath:
+  path: /etc/sysconfig/keyboard

commit caasp-container-manifests for openSUSE:Factory

2018-06-15 Thread root

Hello community,

here is the log from the commit of package caasp-container-manifests for 
openSUSE:Factory checked in at 2018-06-15 14:46: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 Jun 15 14:46:34 2018 rev:15 rq:616507 version:4.0.0+git_r307_0f1f0e9

Changes:

--- 
/work/SRC/openSUSE:Factory/caasp-container-manifests/caasp-container-manifests.changes
  2018-06-02 12:11:39.99304 +0200
+++ 
/work/SRC/openSUSE:Factory/.caasp-container-manifests.new/caasp-container-manifests.changes
 2018-06-15 14:46:36.787600501 +0200
@@ -1,0 +2,76 @@
+Tue Jun 12 11:13:41 UTC 2018 - containers-bui...@suse.de
+
+- Commit adb2262 by Jordi Massaguer Pla jmassaguer...@suse.de
+ fix favicon path
+ 
+ Commit 5aed6c1 by Jordi Massaguer Pla jmassaguer...@suse.de
+ do not mount public directory
+ 
+ Signed-off-by: Jordi Massaguer Pla 
+ 
+ Commit dfdf04a by Jordi Massaguer Pla jmassaguer...@suse.de
+ move the images into the public directory but in a branding subfolder
+ 
+ Signed-off-by: Jordi Massaguer Pla 
+ 
+ Commit 0e9705a by Jordi Massaguer Pla jmassaguer...@suse.de
+ Do not mount the public directory or the compiled assets get hidden in the
+ iso
+ 
+ Mounting the public directory from the host, was "hidding" the assets files
+ present in the public directory and so our images were broken.
+ 
+ This was only happening in the iso and not in our dev environments because in
+ production we have the assets precompiled and we don't compile them on the
+ fly, since we don't have a js engine installed.
+ 
+ Signed-off-by: Jordi Massaguer Pla 
+
+
+---
+Thu Jun  7 18:24:52 UTC 2018 - containers-bui...@suse.de
+
+- Commit e38f5ea by Jordi Massaguer Pla jmassaguer...@suse.de
+ We removed the mysql dir, so we need to do the same in the package
+ 
+ msyql dir was removed in
+ https://github.com/kubic-project/caasp-container-manifests/pull/189
+ 
+ Fixes: bsc#1095335
+ 
+ Signed-off-by: Jordi Massaguer Pla 
+
+
+---
+Thu Jun  7 14:53:23 UTC 2018 - containers-bui...@suse.de
+
+- Commit ea9e260 by Rafael Fernández López eresli...@ereslibre.es
+ Configure `innodb_log_file_size` to a 128M limit
+ 
+ When a salt output is big enough, mysql will refuse to insert the offending
+ row for being too big, with an error:
+ 
+ ```
+ [ERROR   ] Could not store events - returner 'mysql.event_return' raised
+ exception:
+ (1118, 'The size of BLOB/TEXT data inserted in one transaction is greater
+ than 10% of redo log size. Increase the redo log size using
+ innodb_log_file_size.')
+ ```
+ 
+ Whatever we set as `innodb_log_file_size` will be an arbitrary number that
+ will eventually be flooded if the cluster is big enough, or if salt is noisy
+ enough. Given a cluster size, this can suddenly fail if we add more states
+ (thus, increasing salt's output). Obviously, given the same salt states, we
+ can also reach this limit by increasing the cluster size.
+ 
+ There is not a definitive fix for this issue, all we can do for now (without
+ a proper refactor of the way we integrate salt and velum) is to ensure that
+ with todays salt states we can reach a certain number of nodes. As said, this
+ can no longer be true if we add more salt states and we reach again the limit
+ for the same cluster size.
+ 
+ Fixes: bsc#1095335
+
+
+---



Other differences:
--
++ caasp-container-manifests.spec ++
--- /var/tmp/diff_new_pack.dtT86y/_old  2018-06-15 14:46:37.831562313 +0200
+++ /var/tmp/diff_new_pack.dtT86y/_new  2018-06-15 14:46:37.831562313 +0200
@@ -29,7 +29,7 @@
 %endif
 
 Name:   caasp-container-manifests
-Version:4.0.0+git_r298_a05a932
+Version:4.0.0+git_r307_0f1f0e9
 Release:0
 Summary:Manifest file templates for containers on controller node
 License:Apache-2.0
@@ -88,7 +88,7 @@
 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
+for dir in salt/grains salt/minion.d-ca; do
   install -d %{buildroot}/%{_datadir}/%{name}/config/$dir
   install -D -m 0644 config/$dir/* %{buildroot}/%{_datadir}/%{name}/config/$dir
 done

++ master.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/caasp-container-manifests-master/config/mysql/max-allowed-packet.cnf

commit caasp-container-manifests for openSUSE:Factory

2018-06-02 Thread root

Hello community,

here is the log from the commit of package caasp-container-manifests for 
openSUSE:Factory checked in at 2018-06-02 12:11:04

Comparing /work/SRC/openSUSE:Factory/caasp-container-manifests (Old)
 and  /work/SRC/openSUSE:Factory/.caasp-container-manifests.new (New)


Package is "caasp-container-manifests"

Sat Jun  2 12:11:04 2018 rev:14 rq:613117 version:4.0.0+git_r298_a05a932

Changes:

--- 
/work/SRC/openSUSE:Factory/caasp-container-manifests/caasp-container-manifests.changes
  2018-05-29 10:44:19.961792734 +0200
+++ 
/work/SRC/openSUSE:Factory/.caasp-container-manifests.new/caasp-container-manifests.changes
 2018-06-02 12:11:39.99304 +0200
@@ -1,0 +2,74 @@
+Wed May 30 13:33:58 UTC 2018 - containers-bugow...@suse.de
+
+- Commit eda9a39 by Maximilian Meister mmeis...@suse.de
+ mount velum branding
+ 
+ feature#branding
+ 
+ Signed-off-by: Maximilian Meister 
+
+
+---
+Wed May 30 12:16:02 UTC 2018 - containers-bugow...@suse.de
+
+- Commit 70b16ee by David Cassany dcass...@suse.de
+ Make use of the %license macro
+
+
+---
+Wed May 30 10:33:48 UTC 2018 - containers-bugow...@suse.de
+
+- Commit aadfa9b by David Cassany dcass...@suse.de
+ Spec cleaning
+ 
+ * removed env shebang from setup-mysql.sh
+ * removed executable bit from some config files
+
+
+---
+Tue May 29 09:50:39 UTC 2018 - containers-bugow...@suse.de
+
+- Commit 31544c4 by Jordi Massaguer Pla jmassaguer...@suse.de
+ Only require image rpms if we are in a sle version older than sle15
+ 
+ because sle15 will use the suse registry
+ 
+ Signed-off-by: Jordi Massaguer Pla 
+ 
+ Commit 8ebc884 by Jordi Massaguer Pla jmassaguer...@suse.de
+ Revert "Remove image RPM requirements"
+ 
+ This reverts commit 433738bf4bda5eabce933039b504b5b5690f03c5.
+ 
+ Image RPMs are still required by versions < SLE15
+
+
+---
+Mon May 28 16:18:58 UTC 2018 - containers-bugow...@suse.de
+
+- Commit 1e7d2ed by Jordi Massaguer Pla jmassaguer...@suse.de
+ [Packaging] Require container feeder on sle versions older than sle15
+ 
+ We were requiring container feeder on distributions different than sle15, but
+ actually we need them to be older, as sle15 and *newer* dont' require it.
+ 
+ Signed-off-by: Jordi Massaguer Pla 
+ 
+ Commit 433738b by Jordi Massaguer Pla jmassaguer...@suse.de
+ Remove image RPM requirements
+ 
+ CaaSP 4 (SLE15) won't require the images be installed as RPMs
+ 
+ Signed-off-by: Jordi Massaguer Pla 
+ 
+ Commit c6855a1 by Jordi Massaguer Pla jmassaguer...@suse.de
+ fix image name for CaaSP4
+ 
+ We have changed the naming of the images. Instead of calling them
+ sleXY/image_name, we call them caasp/image_name, so we don't have to create a
+ new package each time we change the base image.
+ 
+ Signed-off-by: Jordi Massaguer Pla 
+
+
+---



Other differences:
--
++ caasp-container-manifests.spec ++
--- /var/tmp/diff_new_pack.tgUYxf/_old  2018-06-02 12:11:41.880980754 +0200
+++ /var/tmp/diff_new_pack.tgUYxf/_new  2018-06-02 12:11:41.884980608 +0200
@@ -21,7 +21,7 @@
 %endif
 
 %if 0%{?suse_version} == 1500 && !0%{?is_opensuse}
-  %define _base_image sles15
+  %define _base_image caasp
 %endif
 
 %if 0%{?is_opensuse} && 0%{?suse_version} > 1500
@@ -29,7 +29,7 @@
 %endif
 
 Name:   caasp-container-manifests
-Version:4.0.0+git_r285_beebd20
+Version:4.0.0+git_r298_a05a932
 Release:0
 Summary:Manifest file templates for containers on controller node
 License:Apache-2.0
@@ -39,9 +39,8 @@
 
 # If it is not SLE15, require container-feeder
 # Otherwise, we are using the SUSE Registry
-%if 0%{?sle_version} != 15
+%if 0%{?sle_version} < 15
 Requires:   container-feeder
-%endif
 
 # Require all the docker images
 Requires:   %{_base_image}-caasp-dex-image >= 2.0.0
@@ -59,6 +58,7 @@
 Requires:   %{_base_image}-sidecar-image >= 2.0.0
 Requires:   %{_base_image}-tiller-image >= 2.0.0
 Requires:   %{_base_image}-velum-image >= 2.0.0
+%endif
 # Require all  the things we mount from the host from the kubernetes-salt 
package
 Requires:   kubernetes-salt
 BuildArch:  noarch
@@ -79,7 +79,7 @@
   # fix image name
   sed -e "s|image:[ ]*sles12/\(.*\):|image: %{_base_image}/\1:|g" -i 
%{buildroot}/%{_datadir}/%{name}/$file
 done
-install -D -m 0755 config/haproxy/haproxy.cfg 
%{buildroot}/etc/caasp/haproxy/haproxy.cfg
+install -D -m 0644 config/haproxy/haproxy.cfg 
%{buildroot}/etc/caasp/haproxy/haproxy.cfg

commit caasp-container-manifests for openSUSE:Factory

2018-05-29 Thread root

Hello community,

here is the log from the commit of package caasp-container-manifests for 
openSUSE:Factory checked in at 2018-05-29 10:44:17

Comparing /work/SRC/openSUSE:Factory/caasp-container-manifests (Old)
 and  /work/SRC/openSUSE:Factory/.caasp-container-manifests.new (New)


Package is "caasp-container-manifests"

Tue May 29 10:44:17 2018 rev:13 rq:612253 version:4.0.0+git_r285_beebd20

Changes:

--- 
/work/SRC/openSUSE:Factory/caasp-container-manifests/caasp-container-manifests.changes
  2018-05-22 17:02:43.454561314 +0200
+++ 
/work/SRC/openSUSE:Factory/.caasp-container-manifests.new/caasp-container-manifests.changes
 2018-05-29 10:44:19.961792734 +0200
@@ -1,0 +2,11 @@
+Fri May 25 13:03:44 UTC 2018 - containers-bugow...@suse.de
+
+- Commit ce01435 by Jordi Massaguer Pla jmassaguer...@suse.de
+ Do not requires container-feeder for SLE15
+ 
+ We will be using the SUSE Registry for SLE15
+ 
+ Signed-off-by: Jordi Massaguer Pla 
+
+
+---



Other differences:
--
++ caasp-container-manifests.spec ++
--- /var/tmp/diff_new_pack.3f1BF3/_old  2018-05-29 10:44:20.933756864 +0200
+++ /var/tmp/diff_new_pack.3f1BF3/_new  2018-05-29 10:44:20.937756716 +0200
@@ -29,14 +29,20 @@
 %endif
 
 Name:   caasp-container-manifests
-Version:4.0.0+git_r283_c4e427f
+Version:4.0.0+git_r285_beebd20
 Release:0
 Summary:Manifest file templates for containers on controller node
 License:Apache-2.0
 Group:  System/Management
 Url:https://github.com/kubic-project/caasp-container-manifests
 Source: master.tar.gz
+
+# If it is not SLE15, require container-feeder
+# Otherwise, we are using the SUSE Registry
+%if 0%{?sle_version} != 15
 Requires:   container-feeder
+%endif
+
 # Require all the docker images
 Requires:   %{_base_image}-caasp-dex-image >= 2.0.0
 Requires:   %{_base_image}-dnsmasq-nanny-image >= 2.0.0

++ master.tar.gz ++
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-05-16 14:55:02.0 +0200
+++ new/caasp-container-manifests-master/packaging/suse/make_spec.sh
2018-05-25 15:05:17.0 +0200
@@ -57,7 +57,13 @@
 Url:https://github.com/kubic-project/caasp-container-manifests
 Group:  System/Management
 Source: ${SAFE_BRANCH}.tar.gz
+
+# If it is not SLE15, require container-feeder
+# Otherwise, we are using the SUSE Registry
+%if 0%{?sle_version} != 15
 Requires:   container-feeder
+%endif
+
 # Require all the docker images
 Requires:   %{_base_image}-pause-image >= 2.0.0
 Requires:   %{_base_image}-mariadb-image >= 2.0.0

commit caasp-container-manifests for openSUSE:Factory

2018-05-22 Thread root

Hello community,

here is the log from the commit of package caasp-container-manifests for 
openSUSE:Factory checked in at 2018-05-22 17:02:36

Comparing /work/SRC/openSUSE:Factory/caasp-container-manifests (Old)
 and  /work/SRC/openSUSE:Factory/.caasp-container-manifests.new (New)


Package is "caasp-container-manifests"

Tue May 22 17:02:36 2018 rev:12 rq:611197 version:4.0.0+git_r283_c4e427f

Changes:

--- 
/work/SRC/openSUSE:Factory/caasp-container-manifests/caasp-container-manifests.changes
  2018-05-18 14:27:54.246368151 +0200
+++ 
/work/SRC/openSUSE:Factory/.caasp-container-manifests.new/caasp-container-manifests.changes
 2018-05-22 17:02:43.454561314 +0200
@@ -5,0 +6 @@
+ fix bsc#1071994



Other differences:
--

commit caasp-container-manifests for openSUSE:Factory

2018-05-18 Thread root

Hello community,

here is the log from the commit of package caasp-container-manifests for 
openSUSE:Factory checked in at 2018-05-18 14:27:39

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 May 18 14:27:39 2018 rev:11 rq:610126 version:4.0.0+git_r283_c4e427f

Changes:

--- 
/work/SRC/openSUSE:Factory/caasp-container-manifests/caasp-container-manifests.changes
  2018-05-16 18:45:03.779771239 +0200
+++ 
/work/SRC/openSUSE:Factory/.caasp-container-manifests.new/caasp-container-manifests.changes
 2018-05-18 14:27:54.246368151 +0200
@@ -1,0 +2,7 @@
+Wed May 16 12:54:32 UTC 2018 - containers-bugow...@suse.de
+
+- Commit b74681d by Rafael Fernández López eresli...@ereslibre.es
+ Update manifests to match haproxy changes to work as an http proxy
+
+
+---



Other differences:
--
++ caasp-container-manifests.spec ++
--- /var/tmp/diff_new_pack.HnC5rQ/_old  2018-05-18 14:27:54.838346426 +0200
+++ /var/tmp/diff_new_pack.HnC5rQ/_new  2018-05-18 14:27:54.842346280 +0200
@@ -29,7 +29,7 @@
 %endif
 
 Name:   caasp-container-manifests
-Version:4.0.0+git_r281_fdda2c3
+Version:4.0.0+git_r283_c4e427f
 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.sh2018-05-15 
04:58:20.0 +0200
+++ new/caasp-container-manifests-master/admin-node-setup.sh2018-05-16 
14:55:02.0 +0200
@@ -72,7 +72,7 @@
 
 listen velum
 bind 0.0.0.0:80
-bind 0.0.0.0:443 ssl crt /etc/pki/velum.pem ca-file /etc/pki/ca.crt
+bind 0.0.0.0:443 ssl crt /etc/pki/private/velum-bundle.pem ca-file 
/etc/pki/ca.crt
 mode http
 acl path_autoyast path_reg ^/autoyast$
 option forwardfor
@@ -83,7 +83,7 @@
 server velum unix@/var/run/puma/dashboard.sock
 
 listen velum-api
-bind 127.0.0.1:443 ssl crt /etc/pki/velum.pem ca-file /etc/pki/ca.crt
+bind 127.0.0.1:443 ssl crt /etc/pki/private/velum-bundle.pem ca-file 
/etc/pki/ca.crt
 mode http
 option forwardfor
 http-request set-header X-Forwarded-Proto https
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/caasp-container-manifests-master/config/haproxy/haproxy.cfg 
new/caasp-container-manifests-master/config/haproxy/haproxy.cfg
--- old/caasp-container-manifests-master/config/haproxy/haproxy.cfg 
2018-05-15 04:58:20.0 +0200
+++ new/caasp-container-manifests-master/config/haproxy/haproxy.cfg 
2018-05-16 14:55:02.0 +0200
@@ -13,7 +13,7 @@
 
 listen velum
 bind 0.0.0.0:80
-bind 0.0.0.0:443 ssl crt /etc/pki/velum.pem ca-file /etc/pki/ca.crt
+bind 0.0.0.0:443 ssl crt /etc/pki/private/velum-bundle.pem ca-file 
/etc/pki/ca.crt
 mode http
 acl path_autoyast path_reg ^/autoyast$
 option forwardfor
@@ -24,7 +24,7 @@
 server velum unix@/var/run/puma/dashboard.sock
 
 listen velum-api
-bind 127.0.0.1:444 ssl crt /etc/pki/velum.pem ca-file /etc/pki/ca.crt
+bind 127.0.0.1:444 ssl crt /etc/pki/private/velum-bundle.pem ca-file 
/etc/pki/ca.crt
 mode http
 option forwardfor
 http-request set-header X-Forwarded-Proto https
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/caasp-container-manifests-master/manifests/haproxy.yaml 
new/caasp-container-manifests-master/manifests/haproxy.yaml
--- old/caasp-container-manifests-master/manifests/haproxy.yaml 2018-05-15 
04:58:20.0 +0200
+++ new/caasp-container-manifests-master/manifests/haproxy.yaml 2018-05-16 
14:55:02.0 +0200
@@ -28,13 +28,16 @@
   volumeMounts:
 - name: haproxy-cfg
   mountPath: /etc/haproxy
+- name: ca-certificate
+  mountPath: /etc/pki/ca.crt
+  readOnly: True
+- name: kubernetes-proxy-bundle-certificate
+  mountPath: /etc/pki/private/kube-apiserver-proxy-bundle.pem
+  readOnly: True
 - name: etc-hosts
   mountPath: /etc/hosts
 - name: velum-bundle-certificate
-  mountPath: /etc/pki/velum.pem
-  readOnly: True
-- name: ca-certificate
-  mountPath: /etc/pki/ca.crt
+  mountPath:

commit caasp-container-manifests for openSUSE:Factory

2018-05-16 Thread root

Hello community,

here is the log from the commit of package caasp-container-manifests for 
openSUSE:Factory checked in at 2018-05-16 18:44:02

Comparing /work/SRC/openSUSE:Factory/caasp-container-manifests (Old)
 and  /work/SRC/openSUSE:Factory/.caasp-container-manifests.new (New)


Package is "caasp-container-manifests"

Wed May 16 18:44:02 2018 rev:10 rq:609132 version:4.0.0+git_r281_fdda2c3

Changes:

--- 
/work/SRC/openSUSE:Factory/caasp-container-manifests/caasp-container-manifests.changes
  2018-05-11 09:18:01.387063090 +0200
+++ 
/work/SRC/openSUSE:Factory/.caasp-container-manifests.new/caasp-container-manifests.changes
 2018-05-16 18:45:03.779771239 +0200
@@ -1,0 +2,7 @@
+Tue May 15 02:57:53 UTC 2018 - containers-bugow...@suse.de
+
+- Commit fdda2c3 by Kiall Mac Innes ki...@macinnes.ie
+ Add Housekeeping Job
+
+
+---



Other differences:
--
++ caasp-container-manifests.spec ++
--- /var/tmp/diff_new_pack.G66H5F/_old  2018-05-16 18:45:04.599741606 +0200
+++ /var/tmp/diff_new_pack.G66H5F/_new  2018-05-16 18:45:04.603741462 +0200
@@ -29,7 +29,7 @@
 %endif
 
 Name:   caasp-container-manifests
-Version:4.0.0+git_r280_520ef6f
+Version:4.0.0+git_r281_fdda2c3
 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/Jenkinsfile.housekeeping 
new/caasp-container-manifests-master/Jenkinsfile.housekeeping
--- old/caasp-container-manifests-master/Jenkinsfile.housekeeping   
1970-01-01 01:00:00.0 +0100
+++ new/caasp-container-manifests-master/Jenkinsfile.housekeeping   
2018-05-15 04:58:20.0 +0200
@@ -0,0 +1,5 @@
+def targetBranch = env.getEnvironment().get('CHANGE_TARGET', env.BRANCH_NAME)
+
+library "kubic-jenkins-library@${targetBranch}"
+
+coreKubicProjectHousekeeping()

commit caasp-container-manifests for openSUSE:Factory

2018-05-11 Thread root

Hello community,

here is the log from the commit of package caasp-container-manifests for 
openSUSE:Factory checked in at 2018-05-11 09:17:57

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 May 11 09:17:57 2018 rev:9 rq:606227 version:4.0.0+git_r280_520ef6f

Changes:

--- 
/work/SRC/openSUSE:Factory/caasp-container-manifests/caasp-container-manifests.changes
  2018-05-10 15:49:12.829673061 +0200
+++ 
/work/SRC/openSUSE:Factory/.caasp-container-manifests.new/caasp-container-manifests.changes
 2018-05-11 09:18:01.387063090 +0200
@@ -1,0 +2,15 @@
+Wed May  9 12:16:59 UTC 2018 - containers-bugow...@suse.de
+
+- Commit 2dec06e by Rafael Fernández López eresli...@ereslibre.es
+ Run Velum's `bin/init` as an init container
+ 
+ This will ensure that when the dashboard, api and event processor start, the
+ database has been created and/or migrated at all times. This avoids the weird
+ situation in which the api and event-processor can start while the dashboard
+ was still migrating the database, causing side-effects if Rails already
+ cached some model attributes on other processes.
+ 
+ Fixes: bsc#1091843
+
+
+---



Other differences:
--
++ caasp-container-manifests.spec ++
--- /var/tmp/diff_new_pack.4SW6Hx/_old  2018-05-11 09:18:02.179034396 +0200
+++ /var/tmp/diff_new_pack.4SW6Hx/_new  2018-05-11 09:18:02.183034251 +0200
@@ -29,7 +29,7 @@
 %endif
 
 Name:   caasp-container-manifests
-Version:4.0.0+git_r278_3f83899
+Version:4.0.0+git_r280_520ef6f
 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/manifests/public.yaml 
new/caasp-container-manifests-master/manifests/public.yaml
--- old/caasp-container-manifests-master/manifests/public.yaml  2018-05-08 
12:42:26.0 +0200
+++ new/caasp-container-manifests-master/manifests/public.yaml  2018-05-09 
14:18:00.0 +0200
@@ -115,6 +115,38 @@
 volumeMounts:
 - mountPath: /infra-secrets
   name: infra-secrets
+  - name: velum-dashboard-init
+image: sles12/velum:__TAG__
+env:
+- name: RAILS_ENV
+  value: production
+- name: VELUM_SECRETS_DIR
+  value: /var/lib/misc/velum-secrets
+- name: VELUM_DB_HOST
+  value:
+- name: VELUM_DB_USERNAME
+  value: "velum"
+- name: VELUM_DB_PASSWORD_FILE
+  value: /var/lib/misc/infra-secrets/mariadb-velum-password
+- name: VELUM_DB_SOCKET
+  value: /var/run/mysql/mysql.sock
+volumeMounts:
+- mountPath: /etc/pki/ca.crt
+  name: ca-certificate
+  readOnly: True
+- mountPath: /var/run/mysql
+  name: mariadb-unix-socket
+- mountPath: /var/lib/misc/velum-secrets
+  name: velum-secrets
+- mountPath: /var/lib/misc/infra-secrets
+  name: infra-secrets
+  readOnly: True
+- mountPath: /etc/caasp/cpi
+  name: caasp-cpi-configs
+- mountPath: /etc/caasp/pillar-seeds
+  name: caasp-pillar-seeds
+  readOnly: True
+args: ["bin/init"]
   containers:
   - name: salt-master
 image: sles12/salt-master:__TAG__
@@ -277,7 +309,7 @@
 - mountPath: /etc/caasp/pillar-seeds
   name: caasp-pillar-seeds
   readOnly: True
-args: ["bin/init"]
+args: ["bin/run"]
   - name: velum-api
 image: sles12/velum:__TAG__
 env:

commit caasp-container-manifests for openSUSE:Factory

2018-05-10 Thread root

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 - containers-bugow...@suse.de
+
+- Commit c0644aa by Jordi Massaguer Pla jmassaguer...@suse.de
+ update version to 4.0.0+dev
+
+
+---
+Mon May  7 19:55:14 UTC 2018 - containers-bugow...@suse.de
+
+- Commit 73a51a2 by Thorsten Kukuk ku...@thkukuk.de
+ 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/VERSION2018-04-23 
10:27:23.0 +0200
+++ new/caasp-container-manifests-master/VERSION2018-05-08 
12:42:26.0 +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.sh2018-04-23 
10:27:23.0 +0200
+++ new/caasp-container-manifests-master/activate.sh2018-05-08 
12:42:26.0 +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
---

commit caasp-container-manifests for openSUSE:Factory

2018-04-24 Thread root

Hello community,

here is the log from the commit of package caasp-container-manifests for 
openSUSE:Factory checked in at 2018-04-24 15:33:09

Comparing /work/SRC/openSUSE:Factory/caasp-container-manifests (Old)
 and  /work/SRC/openSUSE:Factory/.caasp-container-manifests.new (New)


Package is "caasp-container-manifests"

Tue Apr 24 15:33:09 2018 rev:7 rq:599948 version:3.0.0+git_r274_c9dd4f7

Changes:

--- 
/work/SRC/openSUSE:Factory/caasp-container-manifests/caasp-container-manifests.changes
  2018-04-20 17:32:55.323028027 +0200
+++ 
/work/SRC/openSUSE:Factory/.caasp-container-manifests.new/caasp-container-manifests.changes
 2018-04-24 15:33:24.853603893 +0200
@@ -1,0 +2,11 @@
+Mon Apr 23 08:27:12 UTC 2018 - containers-bugow...@suse.de
+
+- Commit b34c443 by Kiall Mac Innes ki...@macinnes.ie
+ salt-master and salt-api should not load each others configuration files
+ 
+ Since both need different log_level settings, they need their own config
+ files. The intent for these two files was just that - api specific, and
+ master specific settings.
+
+
+---



Other differences:
--
++ caasp-container-manifests.spec ++
--- /var/tmp/diff_new_pack.ESsr1M/_old  2018-04-24 15:33:25.701573214 +0200
+++ /var/tmp/diff_new_pack.ESsr1M/_new  2018-04-24 15:33:25.705573069 +0200
@@ -29,7 +29,7 @@
 %endif
 
 Name:   caasp-container-manifests
-Version:3.0.0+git_r272_98378ff
+Version:3.0.0+git_r274_c9dd4f7
 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/manifests/public.yaml 
new/caasp-container-manifests-master/manifests/public.yaml
--- old/caasp-container-manifests-master/manifests/public.yaml  2018-04-18 
10:28:53.0 +0200
+++ new/caasp-container-manifests-master/manifests/public.yaml  2018-04-23 
10:27:23.0 +0200
@@ -134,9 +134,6 @@
 - mountPath: /etc/salt/master.d/50-master.conf
   name: salt-master-config-master-conf
   readOnly: True
-- mountPath: /etc/salt/master.d/50-api.conf
-  name: salt-master-config-api-conf
-  readOnly: True
 - mountPath: /etc/salt/master.d/50-peer.conf
   name: salt-master-config-peer-conf
   readOnly: True
@@ -181,26 +178,8 @@
 - mountPath: /etc/pki/ca.crt
   name: ca-certificate
   readOnly: True
-- mountPath: /etc/salt/master.d/50-master.conf
-  name: salt-master-config-master-conf
-  readOnly: True
 - mountPath: /etc/salt/master.d/50-api.conf
-  name: salt-master-config-api-conf
-  readOnly: True
-- mountPath: /etc/salt/master.d/50-peer.conf
-  name: salt-master-config-peer-conf
-  readOnly: True
-- mountPath: /etc/salt/master.d/50-reactor.conf
-  name: salt-master-config-reactor-conf
-  readOnly: True
-- mountPath: /etc/salt/master.d/50-returner.conf
-  name: salt-master-config-returner-conf
-  readOnly: True
-- mountPath: /etc/salt/master.d/55-returner-credentials.conf
-  name: salt-master-config-returner-credentials-conf
-  readOnly: True
-- mountPath: /etc/salt/master.d/75-custom.conf
-  name: salt-master-config-custom-conf
+  name: salt-api-config-api-conf
   readOnly: True
 - mountPath: /var/cache/salt
   name: salt-master-cache
@@ -485,7 +464,7 @@
   - name: salt-master-config-master-conf
 hostPath:
   path: /usr/share/salt/kubernetes/config/master.d/50-master.conf
-  - name: salt-master-config-api-conf
+  - name: salt-api-config-api-conf
 hostPath:
   path: /usr/share/salt/kubernetes/config/master.d/50-api.conf
   - name: salt-master-config-peer-conf

commit caasp-container-manifests for openSUSE:Factory

2018-04-20 Thread root

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 - containers-bugow...@suse.de
+
+- Commit ccbb3d7 by Rafael Fernández López eresli...@ereslibre.es
+ Add minion reconciler to the event processor.
+ 
+ Feature#force-remove-nodes
+
+
+---
+Mon Apr 16 16:58:20 UTC 2018 - containers-bugow...@suse.de
+
+- Commit 2701ede by Thorsten Kukuk ku...@thkukuk.de
+ 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.0 +0200
+++ new/caasp-container-manifests-master/manifests/public.yaml  2018-04-18 
10:28:53.0 +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.0 +0200
+++ new/caasp-container-manifests-master/packaging/suse/make_spec.sh
2018-04-18 10:28:53.0 +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

commit caasp-container-manifests for openSUSE:Factory

2018-04-13 Thread root

Hello community,

here is the log from the commit of package caasp-container-manifests for 
openSUSE:Factory checked in at 2018-04-13 12:52:12

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 13 12:52:12 2018 rev:5 rq:596186 version:3.0.0+git_r268_9eac836

Changes:

--- 
/work/SRC/openSUSE:Factory/caasp-container-manifests/caasp-container-manifests.changes
  2018-03-26 13:09:08.700228314 +0200
+++ 
/work/SRC/openSUSE:Factory/.caasp-container-manifests.new/caasp-container-manifests.changes
 2018-04-13 12:52:55.424697230 +0200
@@ -1,0 +2,10 @@
+Thu Apr 12 18:05:50 UTC 2018 - containers-bugow...@suse.de
+
+- Commit dbbfa42 by Kiall Mac Innes ki...@macinnes.ie
+ Pass through /etc/caasp/pillar-seeds to Velum Dashboard container
+ 
+ This allows for pre-seeding any pillar values specified in the above
+ directory.
+
+
+---



Other differences:
--
++ caasp-container-manifests.spec ++
--- /var/tmp/diff_new_pack.0Dpkux/_old  2018-04-13 12:52:56.164670421 +0200
+++ /var/tmp/diff_new_pack.0Dpkux/_new  2018-04-13 12:52:56.164670421 +0200
@@ -29,7 +29,7 @@
 %endif
 
 Name:   caasp-container-manifests
-Version:3.0.0+git_r266_3eff585
+Version:3.0.0+git_r268_9eac836
 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/manifests/public.yaml 
new/caasp-container-manifests-master/manifests/public.yaml
--- old/caasp-container-manifests-master/manifests/public.yaml  2018-03-23 
12:37:30.0 +0100
+++ new/caasp-container-manifests-master/manifests/public.yaml  2018-04-12 
20:06:11.0 +0200
@@ -295,6 +295,9 @@
   readOnly: True
 - mountPath: /etc/caasp/cpi
   name: caasp-cpi-configs
+- mountPath: /etc/caasp/pillar-seeds
+  name: caasp-pillar-seeds
+  readOnly: True
 args: ["bin/init"]
   - name: velum-api
 image: sles12/velum:__TAG__
@@ -558,3 +561,6 @@
   - name: caasp-cpi-configs
 hostPath:
   path: /etc/caasp/cpi
+  - name: caasp-pillar-seeds
+hostPath:
+  path: /etc/caasp/pillar-seeds

commit caasp-container-manifests for openSUSE:Factory

2018-03-26 Thread root

Hello community,

here is the log from the commit of package caasp-container-manifests for 
openSUSE:Factory checked in at 2018-03-26 13:08:37

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 26 13:08:37 2018 rev:4 rq:590737 version:3.0.0+git_r266_3eff585

Changes:

--- 
/work/SRC/openSUSE:Factory/caasp-container-manifests/caasp-container-manifests.changes
  2018-03-19 23:37:51.902464088 +0100
+++ 
/work/SRC/openSUSE:Factory/.caasp-container-manifests.new/caasp-container-manifests.changes
 2018-03-26 13:09:08.700228314 +0200
@@ -1,0 +2,23 @@
+Fri Mar 23 11:37:36 UTC 2018 - containers-bugow...@suse.de
+
+- Commit 5aeb3dc by Michal Jura mj...@suse.com
+ Mount /etc/caasp/cpi directory to velum
+
+
+---
+Thu Mar 22 15:53:39 UTC 2018 - containers-bugow...@suse.de
+
+- Commit d429409 by Thorsten Kukuk ku...@thkukuk.de
+ Move /etc/issue.d/90-velum.conf to /run/issue.d/80-velum.conf (it's only
+ valid until next reboot) and call issue-generator at the end
+ [bsc#1047192].
+
+
+---
+Thu Mar 22 12:03:59 UTC 2018 - containers-bugow...@suse.de
+
+- Commit 7b30b38 by Thorsten Kukuk ku...@thkukuk.de
+ ifconfig is deprecated since years and removed from SLE15
+
+
+---



Other differences:
--
++ caasp-container-manifests.spec ++
--- /var/tmp/diff_new_pack.7WZN44/_old  2018-03-26 13:09:48.358802434 +0200
+++ /var/tmp/diff_new_pack.7WZN44/_new  2018-03-26 13:09:48.366802147 +0200
@@ -29,7 +29,7 @@
 %endif
 
 Name:   caasp-container-manifests
-Version:3.0.0+git_r260_831e0be
+Version:3.0.0+git_r266_3eff585
 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.sh2018-03-15 
18:07:05.0 +0100
+++ new/caasp-container-manifests-master/admin-node-setup.sh2018-03-23 
12:37:30.0 +0100
@@ -119,9 +119,11 @@
 VELUM_CRT_FINGERPRINT_SHA1=$(openssl x509 -noout -in /etc/pki/velum.crt 
-fingerprint -sha1 | cut -d= -f2)
 VELUM_CRT_FINGERPRINT_SHA256=$(openssl x509 -noout -in /etc/pki/velum.crt 
-fingerprint -sha256 | cut -d= -f2)
 
+# Remove old /etc/issue.d/90-velum.conf to not have two files
+test -f /etc/issue.d/90-velum.conf && rm -f /etc/issue.d/90-velum.conf
 # Generate issue file with Velum details
 # https://bugzilla.suse.com/show_bug.cgi?id=1031682
-cat < /etc/issue.d/90-velum.conf
+cat < /run/issue.d/80-velum.conf
 
 You can manage your cluster by opening the web application running on
 port 443 of this node from your browser: https://
@@ -132,3 +134,5 @@
 Velum SHA1 fingerprint:   $VELUM_CRT_FINGERPRINT_SHA1
 Velum SHA256 fingerprint: $VELUM_CRT_FINGERPRINT_SHA256
 EOF
+# Call issue-generator to use the new issue.d snippet
+/usr/sbin/issue-generator
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/caasp-container-manifests-master/gen-certs.sh 
new/caasp-container-manifests-master/gen-certs.sh
--- old/caasp-container-manifests-master/gen-certs.sh   2018-03-15 
18:07:05.0 +0100
+++ new/caasp-container-manifests-master/gen-certs.sh   2018-03-23 
12:37:30.0 +0100
@@ -152,7 +152,7 @@
 }
 
 ip_addresses() {
-ifconfig | grep -Po 'inet addr:\K[\d.]+' | grep -v '127.0.0.1' | tr '\n' ' 
'
+ip address show | grep -Po 'inet \K[\d.]+' | grep -v '127.0.0.1' | tr '\n' 
' '
 }
 
 all_hostnames=$(echo "$(hostname) $(hostname --fqdn) $(hostnamectl 
--transient) $(hostnamectl --static) \
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-03-15 
18:07:05.0 +0100
+++ new/caasp-container-manifests-master/manifests/public.yaml  2018-03-23 
12:37:30.0 +0100
@@ -293,6 +293,8 @@
 - mountPath: /var/lib/misc/infra-secrets
   name: infra-secrets
   readOnly: True
+- mountPath: /etc/caasp/cpi
+  name: caasp-cpi-configs
 args: ["bin/init"]
   - name: velum-api
 image: sles12/velum:__TAG__
@@ -553,3 +555,6 @@
   - name: public-cloud-config

commit caasp-container-manifests for openSUSE:Factory

2018-03-19 Thread root

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 - containers-bugow...@suse.de
+
+- Commit a90b497 by Richard Brown rbrown...@opensuse.org
+ Remove Kubic workaround, caasp-tools no longer conflicts
+
+
+---
+Wed Mar 14 11:41:38 UTC 2018 - containers-bugow...@suse.de
+
+- Commit 6103539 by Richard Brown rbrown...@opensuse.org
+ 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.sh2018-02-27 
15:13:49.0 +0100
+++ new/caasp-container-manifests-master/admin-node-setup.sh2018-03-15 
18:07:05.0 +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.0 +0100
+++ new/caasp-container-manifests-master/packaging/suse/make_spec.sh
2018-03-15 18:07:05.0 +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

commit caasp-container-manifests for openSUSE:Factory

2018-03-06 Thread root

Hello community,

here is the log from the commit of package caasp-container-manifests for 
openSUSE:Factory checked in at 2018-03-06 10:48:53

Comparing /work/SRC/openSUSE:Factory/caasp-container-manifests (Old)
 and  /work/SRC/openSUSE:Factory/.caasp-container-manifests.new (New)


Package is "caasp-container-manifests"

Tue Mar  6 10:48:53 2018 rev:2 rq:583219 version:3.0.0+git_r256_2ce2854

Changes:

--- 
/work/SRC/openSUSE:Factory/caasp-container-manifests/caasp-container-manifests.changes
  2018-02-21 14:11:05.551008265 +0100
+++ 
/work/SRC/openSUSE:Factory/.caasp-container-manifests.new/caasp-container-manifests.changes
 2018-03-06 10:49:28.775533866 +0100
@@ -1,0 +2,110 @@
+Mon Mar  5 16:15:03 UTC 2018 - rbr...@suse.com
+
+- Remove Kubic workaround, caasp-tools no longer conflicts
+
+---
+Tue Feb 27 14:13:46 UTC 2018 - containers-bugow...@suse.de
+
+- Commit d02a181 by Kiall Mac Innes ki...@macinnes.ie
+ Haproxy: Remove daemon config flag
+
+
+---
+Tue Feb 27 10:31:18 UTC 2018 - containers-bugow...@suse.de
+
+- Commit 4a6ade3 by Kiall Mac Innes ki...@macinnes.ie
+ Fix three upgrade issues
+ 
+ * Migrate the old HAProxy config over
+ * Add the new static velum/velum-api haproxy sections
+ * Generate the missing *-bundle.pem files
+ 
+ Fixes bsc#1080978
+
+
+---
+Tue Feb 27 10:22:55 UTC 2018 - containers-bugow...@suse.de
+
+- Commit 7a8e1d1 by Flavio Castelli fcaste...@suse.com
+ Make entrypoint of mariadb-user-secrets container more robust
+ 
+ I've run into a timing issue that caused the root password of mariadb
+ **not** being injected into the running container "mariadb-user-secrets" in
+ time. That caused the container to enter an infinite loop consisting of
+ trying to connect to mariadb as root without a specifying password, getting
+ an error message, sleeping 1 second and trying again.
+ 
+ This is an init container, as long as it's running kubelet won't start over
+ containers, like openldap, velum-*, salt-*,...
+ 
+ With this change the mariadb entrypoint waits untile the file containing the
+ root password exists and is not empty.
+ 
+ Signed-off-by: Flavio Castelli 
+
+
+---
+Tue Feb 27 08:53:47 UTC 2018 - containers-bugow...@suse.de
+
+- Commit da3c5cc by Kiall Mac Innes ki...@macinnes.ie
+ Update missed LDAP_HOST value from 127.0.0.1 to ldap.infra.caasp.local
+ 
+ I don't think this value is actually used, however, for consistency, lets set
+ it to the correct value. We may want to check if it's used and remove if not.
+
+
+---
+Mon Feb 26 10:52:10 UTC 2018 - containers-bugow...@suse.de
+
+- Commit 30edb7c by Maximilian Meister mmeis...@suse.de
+ enable certificate validation for net-ldap
+ 
+ CVE-2017-17718 requires net-ldap to validate the certificate
+ 
+ therefore set a fixed resolvable name for ldap and generate the certificate
+ for it
+ 
+ Signed-off-by: Maximilian Meister 
+
+
+---
+Thu Feb 22 11:51:48 UTC 2018 - containers-bugow...@suse.de
+
+- Commit 30edb7c by Maximilian Meister mmeis...@suse.de
+ enable certificate validation for net-ldap
+ 
+ CVE-2017-17718 requires net-ldap to validate the certificate
+ 
+ therefore set a fixed resolvable name for ldap and generate the certificate
+ for it
+ 
+ Signed-off-by: Maximilian Meister 
+
+
+---
+Fri Feb 16 14:02:33 UTC 2018 - containers-bugow...@suse.de
+
+- Commit 51731ef by Kiall Mac Innes ki...@macinnes.ie
+ Velum Dash and API both attempt to bind to the same port
+ 
+ It's not possible to reliably bind to 0.0.0.0:443 for one service, and
+ 127.0.0.1:443 for another service.
+ 
+ As such, we'll move velum-api over to 127.0.0.1:444
+
+
+---
+Thu Feb 15 16:33:02 UTC 2018 - containers-bugow...@suse.de
+
+- Commit 94ec5bb by Kiall Mac Innes ki...@macinnes.ie
+ Increase haproxy timeouts from 50sec, to 120sec
+ 
+ Some components have a 60 second timeout for salt request timeouts, e.g the
+ salt-api server which is called by Velum. Increase this timeout to double
+ their timeouts to allow the real failures to be disclosed.
+ 
+ We'll likely want to rework how timeouts are handled soon accross all our
+ components.
+
+
+---



Other differences:
--
++

commit caasp-container-manifests for openSUSE:Factory

commit caasp-container-manifests for openSUSE:Factory

commit caasp-container-manifests for openSUSE:Factory

commit caasp-container-manifests for openSUSE:Factory

commit caasp-container-manifests for openSUSE:Factory

commit caasp-container-manifests for openSUSE:Factory

commit caasp-container-manifests for openSUSE:Factory

commit caasp-container-manifests for openSUSE:Factory

commit caasp-container-manifests for openSUSE:Factory

commit caasp-container-manifests for openSUSE:Factory

commit caasp-container-manifests for openSUSE:Factory

commit caasp-container-manifests for openSUSE:Factory

commit caasp-container-manifests for openSUSE:Factory

commit caasp-container-manifests for openSUSE:Factory

commit caasp-container-manifests for openSUSE:Factory

commit caasp-container-manifests for openSUSE:Factory

commit caasp-container-manifests for openSUSE:Factory

commit caasp-container-manifests for openSUSE:Factory

commit caasp-container-manifests for openSUSE:Factory

19 matches

Site Navigation

Mail list logo

Footer information