Hello community,

here is the log from the commit of package velum for openSUSE:Factory checked 
in at 2018-04-13 12:52:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/velum (Old)
 and      /work/SRC/openSUSE:Factory/.velum.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "velum"

Fri Apr 13 12:52:16 2018 rev:20 rq:596187 
version:3.0.0+dev+git_r721_b3b345cea8107a4333b73fbbe8574d8e53705d5c

Changes:
--------
--- /work/SRC/openSUSE:Factory/velum/velum.changes      2018-04-11 
14:04:53.144526877 +0200
+++ /work/SRC/openSUSE:Factory/.velum.new/velum.changes 2018-04-13 
12:52:57.920606804 +0200
@@ -1,0 +2,38 @@
+Thu Apr 12 16:45:06 UTC 2018 - containers-bugow...@suse.de
+
+- Commit 3364855 by Kiall Mac Innes ki...@macinnes.ie
+ Add and run a import_pillar_seeds rake task
+ 
+ This is a generic rake task that will import seed pillar values from all
+ files in /etc/caasp/pillar-seeds/.
+ 
+ The format of files in this folder should match:
+ 
+ # cat /etc/caasp/pillar-seeds/test.yaml
+ - pillar: cloud:framework
+ value: openstack
+ 
+ feature#hide-openstack-cpi
+
+
+-------------------------------------------------------------------
+Thu Apr 12 10:50:26 UTC 2018 - containers-bugow...@suse.de
+
+- Commit bd18f91 by Rafael Fernández López eresli...@ereslibre.es
+ Avoid the event processor from crashing if it cannot interpret the event
+ arguments
+ 
+ If we executed: `salt-run state.orchestrate 2` we get an error that crashes
+ the event processor:
+ 
+ `TypeError: no implicit conversion of String into Integer`
+ 
+ This happens because of `fun_args.first["mods"]` being `2["mods"]`, what
+ makes it crash with the previous exception. `2.respond_to?(:[])` is `true`,
+ so I think the best thing we can do here is to swallow the exception, and
+ ignore the event if we cannot even process its arguments.
+ 
+ Fixes: bsc#1088597
+
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ velum.spec ++++++
--- /var/tmp/diff_new_pack.WL3pCa/_old  2018-04-13 12:52:58.700578545 +0200
+++ /var/tmp/diff_new_pack.WL3pCa/_new  2018-04-13 12:52:58.704578400 +0200
@@ -23,7 +23,7 @@
 # Version:      1.0.0
 # %%define branch 1.0.0
 
-Version:        3.0.0+dev+git_r717_cf9fe3cc189a6efc1b972ff3e7a724202bb75f7b
+Version:        3.0.0+dev+git_r721_b3b345cea8107a4333b73fbbe8574d8e53705d5c
 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 
cf9fe3cc189a6efc1b972ff3e7a724202bb75f7b from branch master on date Mon, 09 Apr 
2018 18:29:58 +0000
+This package has been built with commit 
b3b345cea8107a4333b73fbbe8574d8e53705d5c from branch master on date Thu, 12 Apr 
2018 16:44:26 +0000
 
 %prep
 %setup -q -n velum-%{branch}

++++++ master.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/velum-master/app/models/salt_handler/orchestration.rb 
new/velum-master/app/models/salt_handler/orchestration.rb
--- old/velum-master/app/models/salt_handler/orchestration.rb   2018-04-09 
20:30:07.000000000 +0200
+++ new/velum-master/app/models/salt_handler/orchestration.rb   2018-04-12 
18:44:47.000000000 +0200
@@ -18,7 +18,12 @@
     fun_args = event_data["fun_args"]
 
     ORCHESTRATIONS.each do |o|
-      return o if [fun_args.first, fun_args.first["mods"]].include? o
+      # rubocop:disable Lint/HandleExceptions
+      begin
+        return o if [fun_args.first, fun_args.first["mods"]].include? o
+      rescue StandardError
+      end
+      # rubocop:enable Lint/HandleExceptions
     end
 
     nil
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/velum-master/bin/init new/velum-master/bin/init
--- old/velum-master/bin/init   2018-04-09 20:30:07.000000000 +0200
+++ new/velum-master/bin/init   2018-04-12 18:44:47.000000000 +0200
@@ -61,6 +61,11 @@
   set -e
 }
 
+setup_pillar_seeds() {
+  # Import pillar seeds
+  bundle exec rake velum:import_pillar_seeds
+}
+
 setup_cpi() {
   # Check if Cloud Provider config exists
   CPI_CONFIG="/etc/caasp/cpi/openstack.conf"
@@ -72,5 +77,6 @@
 
 setup_root_ca
 setup_database
+setup_pillar_seeds
 setup_cpi
 bundle exec "puma -C config/puma.rb"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/velum-master/lib/tasks/velum.rake 
new/velum-master/lib/tasks/velum.rake
--- old/velum-master/lib/tasks/velum.rake       2018-04-09 20:30:07.000000000 
+0200
+++ new/velum-master/lib/tasks/velum.rake       2018-04-12 18:44:47.000000000 
+0200
@@ -1,5 +1,7 @@
 # rubocop:disable Metrics/BlockLength
 
+require "yaml"
+
 namespace :velum do
   desc "Create a user"
   task :create_user, [:email, :password] => :environment do |_, args|
@@ -24,6 +26,27 @@
     end
   end
 
+  desc "Import Pillar Seeds"
+  task import_pillar_seeds: :environment do
+    if !Dir.exist?("/etc/caasp/pillar-seeds/")
+      puts "Pillar seeds directory does not exist"
+    else
+      Dir.foreach("/etc/caasp/pillar-seeds/") do |config_file|
+        next if [".", ".."].include? config_file
+        puts "Importing seeds from #{config_file}"
+
+        seeds = YAML.load_file("/etc/caasp/pillar-seeds/#{config_file}")
+        seeds.each do |seed|
+          puts "Importing seed: #{seed["pillar"]}"
+
+          Pillar.find_or_create_by!(pillar: seed["pillar"]) do |p|
+            p.value = seed["value"]
+          end
+        end
+      end
+    end
+  end
+
   desc "Migrate database users to LDAP"
   task migrate_users: :environment do
     User.where.not(encrypted_password: [nil, ""]).each do |user|


Reply via email to