File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 258258
259259ironic_servers = node_search_with_cache ( "roles:ironic-server" ) || [ ]
260260if ironic_servers . any? && ( node [ "roles" ] & [ "nova-compute-ironic" , "nova-controller" ] ) . any?
261- use_baremetal_filters = true
262261 track_instance_changes = false
263262 ironic_node = ironic_servers . first
264263 ironic_settings = { }
273272 ironic_settings [ :service_password ] = ironic_node [ :ironic ] [ :service_password ]
274273 reserved_host_memory = 0
275274else
276- use_baremetal_filters = false
277275 track_instance_changes = true
278276 ironic_settings = nil
279277 reserved_host_memory = node [ :nova ] [ :scheduler ] [ :reserved_host_memory_mb ]
420418 has_itxt : has_itxt ,
421419 enabled_filters : node [ :nova ] [ :scheduler ] [ :enabled_filters ] ,
422420 reserved_host_memory : reserved_host_memory ,
423- use_baremetal_filters : use_baremetal_filters ,
424421 track_instance_changes : track_instance_changes ,
425422 ironic_settings : ironic_settings ,
426423 ephemeral_rbd_settings : ephemeral_rbd_settings ,
Original file line number Diff line number Diff line change @@ -6,9 +6,6 @@ key = <%= @vncproxy_key_file %>
66instance_name_template=zvm%05x
77<% end %>
88my_ip = <%= node[:nova][:my_ip] %>
9- <% unless @ironic_settings.nil? %>
10- scheduler_host_manager = ironic_host_manager
11- <% end %>
129state_path = /var/lib/nova
1310enabled_ssl_apis = <%= @ssl_enabled ? "osapi_compute,metadata" : "" %>
1411osapi_compute_listen = <%= @bind_host %>
@@ -354,9 +351,6 @@ host_manager = ironic_host_manager
354351<% end %>
355352
356353[filter_scheduler]
357- <% if @use_baremetal_filters %>
358- use_baremetal_filters = true
359- <% end %>
360354<% if @has_itxt %>
361355available_filters = nova.scheduler.filters.standard_filters
362356<% if @enabled_filters.empty? %>
You can’t perform that action at this time.
0 commit comments