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 - [email protected]
+
+- Commit 5aeb3dc by Michal Jura [email protected]
+ Mount /etc/caasp/cpi directory to velum
+
+
+-------------------------------------------------------------------
+Thu Mar 22 15:53:39 UTC 2018 - [email protected]
+
+- Commit d429409 by Thorsten Kukuk [email protected]
+ 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 - [email protected]
+
+- Commit 7b30b38 by Thorsten Kukuk [email protected]
+ 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.sh 2018-03-15
18:07:05.000000000 +0100
+++ new/caasp-container-manifests-master/admin-node-setup.sh 2018-03-23
12:37:30.000000000 +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 <<EOF > /etc/issue.d/90-velum.conf
+cat <<EOF > /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://<this-node>
@@ -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.000000000 +0100
+++ new/caasp-container-manifests-master/gen-certs.sh 2018-03-23
12:37:30.000000000 +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.000000000 +0100
+++ new/caasp-container-manifests-master/manifests/public.yaml 2018-03-23
12:37:30.000000000 +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
hostPath:
path: /etc/salt/pillar
+ - name: caasp-cpi-configs
+ hostPath:
+ path: /etc/caasp/cpi
