Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nova: Remove deprecated options (SOC-7852) #2407

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

nova: Remove deprecated options (SOC-7852) #2407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions chef/cookbooks/nova/recipes/config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,6 @@

ironic_servers = node_search_with_cache("roles:ironic-server") || []
if ironic_servers.any? && (node["roles"] & ["nova-compute-ironic", "nova-controller"]).any?
use_baremetal_filters = true
track_instance_changes = false
ironic_node = ironic_servers.first
ironic_settings = {}
Expand All @@ -273,7 +272,6 @@
ironic_settings[:service_password] = ironic_node[:ironic][:service_password]
reserved_host_memory = 0
else
use_baremetal_filters = false
track_instance_changes = true
ironic_settings = nil
reserved_host_memory = node[:nova][:scheduler][:reserved_host_memory_mb]
Expand Down Expand Up @@ -420,7 +418,6 @@
has_itxt: has_itxt,
enabled_filters: node[:nova][:scheduler][:enabled_filters],
reserved_host_memory: reserved_host_memory,
use_baremetal_filters: use_baremetal_filters,
track_instance_changes: track_instance_changes,
ironic_settings: ironic_settings,
ephemeral_rbd_settings: ephemeral_rbd_settings,
Expand Down
6 changes: 0 additions & 6 deletions chef/cookbooks/nova/templates/default/nova.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ key = <%= @vncproxy_key_file %>
instance_name_template=zvm%05x
<% end %>
my_ip = <%= node[:nova][:my_ip] %>
<% unless @ironic_settings.nil? %>
scheduler_host_manager = ironic_host_manager
<% end %>
state_path = /var/lib/nova
enabled_ssl_apis = <%= @ssl_enabled ? "osapi_compute,metadata" : "" %>
osapi_compute_listen = <%= @bind_host %>
Expand Down Expand Up @@ -354,9 +351,6 @@ host_manager = ironic_host_manager
<% end %>

[filter_scheduler]
<% if @use_baremetal_filters %>
use_baremetal_filters = true
<% end %>
<% if @has_itxt %>
available_filters = nova.scheduler.filters.standard_filters
<% if @enabled_filters.empty? %>
Expand Down