Hello community,
here is the log from the commit of package velum for openSUSE:Factory checked
in at 2018-04-16 15:45:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/velum (Old)
and /work/SRC/openSUSE:Factory/.velum.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "velum"
Mon Apr 16 15:45:59 2018 rev:21 rq:596982
version:3.0.0+dev+git_r723_2e93fa9a1dd8002ae016b8e5996b603ccd0c0dc1
Changes:
--------
--- /work/SRC/openSUSE:Factory/velum/velum.changes 2018-04-13
12:52:57.920606804 +0200
+++ /work/SRC/openSUSE:Factory/.velum.new/velum.changes 2018-04-16
15:46:00.896575465 +0200
@@ -1,0 +2,10 @@
+Mon Apr 16 11:15:14 UTC 2018 - containers-bugow...@suse.de
+
+- Commit e46dca7 by Michal Jura mj...@suse.com
+ Skip worker_bootstrap when cloud_framework is openstack, bsc#1089652
+
+ We don't provide openstack-types.json file for OpenStack cloud framework. We
+ have to skip worker_bootstrap function from SetupController class.
+
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ velum.spec ++++++
--- /var/tmp/diff_new_pack.YfQxcA/_old 2018-04-16 15:46:01.484554203 +0200
+++ /var/tmp/diff_new_pack.YfQxcA/_new 2018-04-16 15:46:01.484554203 +0200
@@ -23,7 +23,7 @@
# Version: 1.0.0
# %%define branch 1.0.0
-Version: 3.0.0+dev+git_r721_b3b345cea8107a4333b73fbbe8574d8e53705d5c
+Version: 3.0.0+dev+git_r723_2e93fa9a1dd8002ae016b8e5996b603ccd0c0dc1
Release: 0
%define branch master
Summary: Dashboard for CaasP
@@ -96,7 +96,7 @@
%description
velum is the dashboard for CaasP to manage and deploy kubernetes clusters on
top of MicroOS
-This package has been built with commit
b3b345cea8107a4333b73fbbe8574d8e53705d5c from branch master on date Thu, 12 Apr
2018 16:44:26 +0000
+This package has been built with commit
2e93fa9a1dd8002ae016b8e5996b603ccd0c0dc1 from branch master on date Mon, 16 Apr
2018 11:14:33 +0000
%prep
%setup -q -n velum-%{branch}
++++++ master.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/velum-master/app/controllers/setup_controller.rb
new/velum-master/app/controllers/setup_controller.rb
--- old/velum-master/app/controllers/setup_controller.rb 2018-04-12
18:44:47.000000000 +0200
+++ new/velum-master/app/controllers/setup_controller.rb 2018-04-16
13:15:09.000000000 +0200
@@ -64,10 +64,12 @@
end
end
+ # rubocop:disable Metrics/CyclomaticComplexity
def worker_bootstrap
@controller_node = Pillar.value pillar: :dashboard
- return unless (cloud = Pillar.value(pillar: :cloud_framework))
+ cloud = Pillar.value(pillar: :cloud_framework) || ""
+ return if cloud.empty? || cloud == "openstack"
@instance_types = Velum::InstanceType.for(cloud)
@cloud_cluster = CloudCluster.new(
@@ -85,6 +87,7 @@
end
render "worker_bootstrap_#{cloud}".to_sym
end
+ # rubocop:enable Metrics/CyclomaticComplexity
def build_cloud_cluster
@cloud_cluster = CloudCluster.new(cloud_cluster_params)
