Sync with stable/3.0 part of the rails app for apply_role improvements

crowbar_framework/app/controllers/barclamp_controller.rb

@@ -569,6 +569,8 @@ def proposal_update
           "crowbar-deep-merge-template"
         )
       )
+      # See FIXME in ServiceObject.apply_role
+      message = "" if code == 202
 
       respond_to do |format|
         case code
@@ -623,7 +625,10 @@ def proposal_update
           @proposal["attributes"][params[:barclamp]] = JSON.parse(params[:proposal_attributes])
           @proposal["deployment"][params[:barclamp]] = JSON.parse(params[:proposal_deployment])
           @service_object.save_proposal!(@proposal)
-          answer = @service_object.proposal_commit(params[:name])
+          # validation already happened on save
+          answer = @service_object.proposal_commit(params[:name],
+                                                   validate: false,
+                                                   validate_after_save: false)
           flash[:alert] = answer[1] if answer[0] >= 400
           flash[:notice] = answer[1] if answer[0] >= 300 and answer[0] < 400
           flash[:notice] = t("barclamp.proposal_show.commit_proposal_success") if answer[0] == 200

crowbar_framework/app/models/crowbar_service.rb

@@ -45,7 +45,12 @@ def role_constraints
   # Unfortunatelly we need to explicitely look at crowbar-status of the proposal
   # because apply_role from this model ignores errors from superclass's apply_role.
   def commit_and_check_proposal
-    answer = proposal_commit("default", false, false)
+    answer = proposal_commit(
+      "default",
+      in_queue: false,
+      validate: false,
+      validate_after_save: false
+    )
     # check if error message is saved in one of the nodes
     if answer.first != 200
       found_errors = []
@@ -390,7 +395,7 @@ def prepare_nodes_for_crowbar_upgrade
     proposal.raw_data["deployment"]["crowbar"]["elements"]["crowbar-upgrade"] = nodes_to_upgrade
     proposal.save
     # commit the proposal so chef recipe get executed
-    proposal_commit("default", false, false)
+    proposal_commit("default", in_queue: false, validate_after_save: false)
   end
 
   def disable_non_core_proposals
@@ -492,7 +497,7 @@ def revert_nodes_from_crowbar_upgrade
 
     # commit current proposal (with the crowbar-upgrade role still assigned to nodes),
     # so the recipe is executed when nodes have 'ready' state
-    proposal_commit("default", false, false)
+    proposal_commit("default", in_queue: false, validate: false, validate_after_save: false)
     # now remove the nodes from upgrade role
     proposal["deployment"]["crowbar"]["elements"]["crowbar-upgrade"] = []
     proposal.save
@@ -569,7 +574,7 @@ def apply_role (role, inst, in_queue)
             else
               unless answer[1].include?(id)
                 @logger.debug("Crowbar apply_role: #{k}.#{id} wasn't active: Activating")
-                answer = service.proposal_commit(id, false, false)
+                answer = service.proposal_commit(id, in_queue: false, validate_after_save: false)
                 if answer[0] != 200
                   answer[1] = "Failed to commit proposal '#{id}' for '#{k}' " +
                               "(The error message was: #{answer[1].strip})"

crowbar_framework/app/models/network_service.rb

@@ -122,8 +122,10 @@ def allocate_ip_by_type(bc_instance, network, range, object, type, suggestion =
 
     if type == :node
       # Save the information.
-      node.crowbar["crowbar"]["network"][network] = net_info
-      node.save
+      if node.crowbar["crowbar"]["network"][network] != net_info
+        node.crowbar["crowbar"]["network"][network] = net_info
+        node.save
+      end
     end
 
     @logger.info("Network allocate ip for #{type}: Assigned: #{name} #{network} #{range} #{net_info["address"]}")