Merge pull request #22517 from jaywcarman/fix_cloud_provision_quota_c…

…pu_mem_calcs

Fix cloud provision quota memory and cpu counting

app/models/mixins/miq_provision_quota_mixin.rb

@@ -365,7 +365,9 @@ def flavor(request)
   end
 
   def number_of_cpus(prov, cloud, flavor_obj)
-    return flavor_obj.try(:cpus) if cloud
+    num_cpus = flavor_obj.try(:cpus) if cloud
+    return num_cpus if num_cpus.present?
+
     request = prov.kind_of?(MiqRequest) ? prov : prov.miq_request
     num_cpus = request.get_option(:number_of_sockets).to_i * request.get_option(:cores_per_socket).to_i
     num_cpus.zero? ? request.get_option(:number_of_cpus).to_i : num_cpus
@@ -384,7 +386,9 @@ def storage(prov, cloud, vendor, flavor_obj = nil)
   end
 
   def memory(prov, cloud, vendor, flavor_obj = nil)
-    return flavor_obj.try(:memory) if cloud
+    memory = flavor_obj.try(:memory) if cloud
+    return memory if memory.present?
+
     request = prov.kind_of?(MiqRequest) ? prov : prov.miq_request
     memory = request.get_option(:vm_memory).to_i
     %w(amazon openstack google).include?(vendor) ? memory : memory.megabytes