Change ENV variable to MIQ_SERVER_DEFAULT_ROLES to avoid conflict

carbonin · Jun 29, 2017 · 6e84d92 · 6e84d92
1 parent a3e5404
commit 6e84d92
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/models/miq_server/role_management.rb b/app/models/miq_server/role_management.rb
@@ -55,7 +55,7 @@ def sync_assigned_roles
  end
 
  def ensure_default_roles
- MiqServer.my_server.add_settings_for_resource(:server => {:role => ENV["DEFAULT_ROLES"]}) if role.blank? && ENV["DEFAULT_ROLES"].present?
+ MiqServer.my_server.add_settings_for_resource(:server => {:role => ENV["MIQ_SERVER_DEFAULT_ROLES"]}) if role.blank? && ENV["MIQ_SERVER_DEFAULT_ROLES"].present?
  sync_assigned_roles
  end