Hello community,
here is the log from the commit of package velum for openSUSE:Factory checked
in at 2018-07-23 18:02:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/velum (Old)
and /work/SRC/openSUSE:Factory/.velum.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "velum"
Mon Jul 23 18:02:35 2018 rev:40 rq:624698
version:4.0.0+dev+git_r859_b55671441cd42c71da60f5c1dab26591651f4af1
Changes:
--------
--- /work/SRC/openSUSE:Factory/velum/velum.changes 2018-07-13
10:21:42.714481344 +0200
+++ /work/SRC/openSUSE:Factory/.velum.new/velum.changes 2018-07-23
18:03:41.932730660 +0200
@@ -1,0 +2,11 @@
+Thu Jul 19 09:16:44 UTC 2018 - containers-bugow...@suse.de
+
+- Commit d88991f by Michal Jura mj...@suse.com
+ [CPI] Add option to ignore OpenStack Cinder availability zone, bsc#1095572
+
+ Ignore OpenStack Cinder avability zone when attaching volumes. When Nova and
+ Cinder have different availability zones, this should be set to true. Default
+ is false.
+
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ velum.spec ++++++
--- /var/tmp/diff_new_pack.6RQ88f/_old 2018-07-23 18:03:42.384730102 +0200
+++ /var/tmp/diff_new_pack.6RQ88f/_new 2018-07-23 18:03:42.388730097 +0200
@@ -23,7 +23,7 @@
# Version: 1.0.0
# %%define branch 1.0.0
-Version: 4.0.0+dev+git_r857_d2c6971de32315a433620d76da0a757677fa0594
+Version: 4.0.0+dev+git_r859_b55671441cd42c71da60f5c1dab26591651f4af1
Release: 0
%define branch master
Summary: Dashboard for CaasP
@@ -93,7 +93,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
d2c6971de32315a433620d76da0a757677fa0594 from branch master on date Fri, 06 Jul
2018 17:05:03 +0000
+This package has been built with commit
b55671441cd42c71da60f5c1dab26591651f4af1 from branch master on date Thu, 19 Jul
2018 09:16:04 +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/internal_api/v1/pillars_controller.rb
new/velum-master/app/controllers/internal_api/v1/pillars_controller.rb
--- old/velum-master/app/controllers/internal_api/v1/pillars_controller.rb
2018-07-06 19:07:10.000000000 +0200
+++ new/velum-master/app/controllers/internal_api/v1/pillars_controller.rb
2018-07-19 11:18:06.000000000 +0200
@@ -145,7 +145,8 @@
floating: Pillar.value(pillar: :cloud_openstack_floating),
subnet: Pillar.value(pillar: :cloud_openstack_subnet),
bs_version: Pillar.value(pillar: :cloud_openstack_bs_version),
- lb_mon_retries: Pillar.value(pillar: :cloud_openstack_lb_mon_retries)
+ lb_mon_retries: Pillar.value(pillar:
:cloud_openstack_lb_mon_retries),
+ ignore_vol_az: Pillar.value(pillar: :cloud_openstack_ignore_vol_az)
}
}
}
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-07-06
19:07:10.000000000 +0200
+++ new/velum-master/app/controllers/setup_controller.rb 2018-07-19
11:18:06.000000000 +0200
@@ -50,6 +50,7 @@
@cloud_openstack_floating = Pillar.value(pillar: :cloud_openstack_floating)
@cloud_openstack_lb_mon_retries = Pillar.value(pillar:
:cloud_openstack_lb_mon_retries) || "3"
@cloud_openstack_bs_version = Pillar.value(pillar:
:cloud_openstack_bs_version) || "v2"
+ @cloud_openstack_ignore_vol_az = Pillar.value(pillar:
:cloud_openstack_ignore_vol_az) || "false"
# container runtime setting
@cri = Pillar.value(pillar: :container_runtime) || "docker"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/velum-master/app/models/pillar.rb
new/velum-master/app/models/pillar.rb
--- old/velum-master/app/models/pillar.rb 2018-07-06 19:07:10.000000000
+0200
+++ new/velum-master/app/models/pillar.rb 2018-07-19 11:18:06.000000000
+0200
@@ -125,7 +125,9 @@
cloud_openstack_lb_mon_retries:
"cloud:openstack:lb_mon_retries",
cloud_openstack_bs_version:
- "cloud:openstack:bs_version"
+ "cloud:openstack:bs_version",
+ cloud_openstack_ignore_vol_az:
+ "cloud:openstack:ignore_vol_az"
}
end
# rubocop:enable Layout/AlignHash
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/velum-master/app/views/setup/cloud/_openstack_configuration.html.slim
new/velum-master/app/views/setup/cloud/_openstack_configuration.html.slim
--- old/velum-master/app/views/setup/cloud/_openstack_configuration.html.slim
2018-07-06 19:07:10.000000000 +0200
+++ new/velum-master/app/views/setup/cloud/_openstack_configuration.html.slim
2018-07-19 11:18:06.000000000 +0200
@@ -37,3 +37,6 @@
.form-group
= f.label :cloud_openstack_bs_version, "Cinder Block Storage API version"
= f.text_field :cloud_openstack_bs_version, value:
@cloud_openstack_bs_version, class: "form-control"
+ .form-group
+ = f.label :cloud_openstack_ignore_vol_az, "Ignore Cinder availability zone"
+ = f.text_field :cloud_openstack_ignore_vol_az, value:
@cloud_openstack_ignore_vol_az, class: "form-control"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/velum-master/lib/tasks/cpi.rake
new/velum-master/lib/tasks/cpi.rake
--- old/velum-master/lib/tasks/cpi.rake 2018-07-06 19:07:10.000000000 +0200
+++ new/velum-master/lib/tasks/cpi.rake 2018-07-19 11:18:06.000000000 +0200
@@ -27,6 +27,7 @@
when "floating-network-id" then cfg["cloud:openstack:floating_id"] =
value
when "monitor-max-retries" then cfg["cloud:openstack:lb_mon_retries"] =
value
when "bs-version" then cfg["cloud:openstack:bs_version"] = value
+ when "ignore-volume-az" then cfg["cloud:openstack:ignore_vol_az"] =
value
when /^./ then puts "Unknown option: #{key}"
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/velum-master/spec/controllers/internal_api/v1/pillars_controller_spec.rb
new/velum-master/spec/controllers/internal_api/v1/pillars_controller_spec.rb
---
old/velum-master/spec/controllers/internal_api/v1/pillars_controller_spec.rb
2018-07-06 19:07:10.000000000 +0200
+++
new/velum-master/spec/controllers/internal_api/v1/pillars_controller_spec.rb
2018-07-19 11:18:06.000000000 +0200
@@ -327,7 +327,8 @@
floating: "9bc3e819-a6ca-648b-b5e3-c26c9e6c5e57",
subnet: "4b64b38d-0b38-40d0-a69f-ade7299ef4ab",
bs_version: "v2",
- lb_mon_retries: "3"
+ lb_mon_retries: "3",
+ ignore_vol_az: "false"
}
}
}
