mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-22 20:54:49 +09:00
1 parent
728ba4073d
commit
93ae20badc
5 files changed
+12
-7
No files matched your search
@@ -47,7 +47,7 @@ class OneFlowHelper < OpenNebulaHelper::OneHelper
|
||||
d['GNAME']
|
||||
end
|
||||
|
||||
column :NAME, 'Name', :size => 25, :left => true do |d|
|
||||
column :NAME, 'Name', :expand => true, :left => true do |d|
|
||||
d['NAME']
|
||||
end
|
||||
|
||||
|
||||
@@ -47,7 +47,7 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
|
||||
d['GNAME']
|
||||
end
|
||||
|
||||
column :NAME, 'Name', :left, :size => 37 do |d|
|
||||
column :NAME, 'Name', :left, :expand => true do |d|
|
||||
d['NAME']
|
||||
end
|
||||
|
||||
|
||||
@@ -81,6 +81,9 @@ class ServiceAutoScaler
|
||||
policies['elasticity_policies'] = role.elasticity_policies
|
||||
policies['scheduled_policies'] = role.scheduled_policies
|
||||
|
||||
# if diff is zero, cooldown doesn't matter
|
||||
cooldown_duration = nil if diff == 0
|
||||
|
||||
@lcm.update_role_policies(client,
|
||||
service.id,
|
||||
name,
|
||||
|
||||
@@ -284,7 +284,7 @@ module OpenNebula
|
||||
end
|
||||
|
||||
def update_cooldown(new_cooldown)
|
||||
@body['cooldown'] = new_cooldown
|
||||
@body['cooldown'] = new_cooldown unless new_cooldown.nil?
|
||||
end
|
||||
|
||||
# Sets a new state
|
||||
|
||||
@@ -527,10 +527,12 @@ post '/service_template/:id/action' do
|
||||
end
|
||||
|
||||
# remove escapes
|
||||
networks_values.each do |net|
|
||||
net.map do |_, value|
|
||||
value.map do |_, value1|
|
||||
value1.gsub!('\\"', '')
|
||||
if networks_values
|
||||
networks_values.each do |net|
|
||||
net.map do |_, value|
|
||||
value.map do |_, value1|
|
||||
value1.gsub!('\\"', '')
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in new issue
Block a user