Hello community, here is the log from the commit of package velum for openSUSE:Factory checked in at 2018-05-10 15:50:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/velum (Old) and /work/SRC/openSUSE:Factory/.velum.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "velum" Thu May 10 15:50:49 2018 rev:25 rq:605707 version:4.0.0+dev+git_r744_91ff022f1f12c133c9ccf131aa97bdd9091e4e50 Changes: -------- --- /work/SRC/openSUSE:Factory/velum/velum.changes 2018-04-27 16:10:13.572301791 +0200 +++ /work/SRC/openSUSE:Factory/.velum.new/velum.changes 2018-05-10 15:50:51.222066861 +0200 @@ -1,0 +2,34 @@ +Wed May 9 07:05:38 UTC 2018 - [email protected] + +- Commit 45bee11 by Rafael Fernández López [email protected] + Use `update_columns` to update minion attributes with the minion reconciler + + This will avoid strange issues when Rails caches the attributes of the + `minions` table (we also avoid the need to `reload` explicitly for this + corner cases). + + Fixes: bsc#1091843 + + +------------------------------------------------------------------- +Tue May 8 15:16:17 UTC 2018 - [email protected] + +- Commit add62fa by Vítor Avelino [email protected] + Fixed misleading text about nodes selection + + Small fix of a misleading text that referred to an old behavior of the nodes + discovery page. + + bsc#1059787 + + Signed-off-by: Vítor Avelino <[email protected]> + + +------------------------------------------------------------------- +Tue May 8 10:42:32 UTC 2018 - [email protected] + +- Commit 8ef0c57 by Jordi Massaguer Pla [email protected] + update version to 4.0.0+dev + + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ velum.spec ++++++ --- /var/tmp/diff_new_pack.WqcmSM/_old 2018-05-10 15:50:51.930040913 +0200 +++ /var/tmp/diff_new_pack.WqcmSM/_new 2018-05-10 15:50:51.930040913 +0200 @@ -23,7 +23,7 @@ # Version: 1.0.0 # %%define branch 1.0.0 -Version: 3.0.0+dev+git_r738_10fcaf450fd1ac030569f55335e6ba1f31662c8e +Version: 4.0.0+dev+git_r744_91ff022f1f12c133c9ccf131aa97bdd9091e4e50 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 10fcaf450fd1ac030569f55335e6ba1f31662c8e from branch master on date Fri, 27 Apr 2018 12:04:35 +0000 +This package has been built with commit 91ff022f1f12c133c9ccf131aa97bdd9091e4e50 from branch master on date Wed, 09 May 2018 07:04:56 +0000 %prep %setup -q -n velum-%{branch} ++++++ master.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/velum-master/VERSION new/velum-master/VERSION --- old/velum-master/VERSION 2018-04-27 14:05:40.000000000 +0200 +++ new/velum-master/VERSION 2018-05-09 09:05:11.000000000 +0200 @@ -1 +1 @@ -3.0.0+dev +4.0.0+dev diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/velum-master/app/models/minion.rb new/velum-master/app/models/minion.rb --- old/velum-master/app/models/minion.rb 2018-04-27 14:05:40.000000000 +0200 +++ new/velum-master/app/models/minion.rb 2018-05-09 09:05:11.000000000 +0200 @@ -15,17 +15,18 @@ # Update all minions grains def self.update_grains - # rubocop:disable Lint/HandleExceptions + # rubocop:disable Lint/HandleExceptions, SkipsModelValidations Minion.all.find_each do |minion| begin minion_grains = minion.salt.info - minion.tx_update_reboot_needed = minion_grains["tx_update_reboot_needed"] || false - minion.tx_update_failed = minion_grains["tx_update_failed"] || false - minion.save + tx_update_reboot_needed = minion_grains["tx_update_reboot_needed"] || false + tx_update_failed = minion_grains["tx_update_failed"] || false + minion.update_columns tx_update_reboot_needed: tx_update_reboot_needed, + tx_update_failed: tx_update_failed rescue StandardError end end - # rubocop:enable Lint/HandleExceptions + # rubocop:enable Lint/HandleExceptions, SkipsModelValidations end # Example: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/velum-master/app/views/setup/discovery.html.slim new/velum-master/app/views/setup/discovery.html.slim --- old/velum-master/app/views/setup/discovery.html.slim 2018-04-27 14:05:40.000000000 +0200 +++ new/velum-master/app/views/setup/discovery.html.slim 2018-05-09 09:05:11.000000000 +0200 @@ -36,7 +36,9 @@ i.fa.fa-times.fa-fw | Deselect all nodes .panel-body - p After choosing the master and clicking "Next" all the other selected nodes will be set to the worker role. + p + | Please choose an odd number of <em>Master</em> nodes, then click "Select remaining nodes" + | to assign the remaining nodes to the <em>Worker</em> role. = form_tag(setup_discovery_path, method: "post") .nodes-container data-url=setup_discovery_path diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/velum-master/spec/features/node_force_removal_feature_spec.rb new/velum-master/spec/features/node_force_removal_feature_spec.rb --- old/velum-master/spec/features/node_force_removal_feature_spec.rb 2018-04-27 14:05:40.000000000 +0200 +++ new/velum-master/spec/features/node_force_removal_feature_spec.rb 2018-05-09 09:05:11.000000000 +0200 @@ -47,7 +47,7 @@ expect(page).to have_css(worker_selector, text: "Force remove") find(worker_link).click - click_on "Proceed anyway" + click_on "Proceed with forcible removal" expect(page).to have_css(worker_selector, text: "Pending removal") end @@ -64,9 +64,9 @@ master_link = "#{master_selector} .force-remove-node-link" find(master_link).click - expect(page).to have_content("Proceed anyway") + expect(page).to have_content("Proceed with forcible removal") - click_on "Proceed anyway" + click_on "Proceed with forcible removal" expect(page).to have_css(master_selector, text: "Pending removal") end @@ -75,7 +75,7 @@ worker_link = "#{worker_selector} .force-remove-node-link" find(worker_link).click - click_on "Proceed anyway" + click_on "Proceed with forcible removal" minions[1].update!(highstate: "pending_removal") expect(page).to have_css(worker_selector, text: "Pending removal") @@ -100,7 +100,7 @@ worker_link = "#{worker_selector} .force-remove-node-link" find(worker_link).click - click_on "Proceed anyway" + click_on "Proceed with forcible removal" minions[1].update!(highstate: "pending_removal") expect(page).to have_css(worker_selector, text: "Pending removal") @@ -128,7 +128,7 @@ worker_link = "#{worker_selector} .force-remove-node-link" find(worker_link).click - click_on "Proceed anyway" + click_on "Proceed with forcible removal" minions[1].update!(highstate: "pending_removal") expect(page).to have_css(worker_selector, text: "Pending removal") @@ -158,7 +158,7 @@ expect(page).to have_css(worker_selector, text: "Force remove") find(worker_link).click - click_on "Proceed anyway" + click_on "Proceed with forcible removal" expect(page).to have_content("Orchestration currently ongoing. Please wait for it to finish.") end end @@ -171,7 +171,7 @@ expect(page).to have_css(worker_selector, text: "Force remove") find(worker_link).click - click_on "Proceed anyway" + click_on "Proceed with forcible removal" minions[1].update!(highstate: "removal_failed") expect(page).to have_content("Removal Failed") end @@ -185,7 +185,7 @@ expect(page).to have_css(worker_selector, text: "Force remove") find(worker_link).click - click_on "Proceed anyway" + click_on "Proceed with forcible removal" expect(page).to have_content("An attempt to remove node #{minions[3].minion_id} has failed") end end
