commit caasp-container-manifests for openSUSE:Factory
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-bugowner@suse.de + +- Commit b34c443 by Kiall Mac Innes kiall@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.000000000 +0200 +++ new/caasp-container-manifests-master/manifests/public.yaml 2018-04-23 10:27:23.000000000 +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
participants (1)
-
root@hilbert.suse.de