From 1eec1bc211850a0550bab97b734676bd6bdea3fa Mon Sep 17 00:00:00 2001 From: Nick Carboni Date: Mon, 30 Apr 2018 15:12:29 -0400 Subject: [PATCH] Use Settings directly for getting the memcached server address MiqMemcached.server_address was introduced in #15326 which is not in fine --- lib/embedded_ansible.rb | 2 +- spec/lib/embedded_ansible_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/embedded_ansible.rb b/lib/embedded_ansible.rb index 29592b40281c..2dbe03486ea2 100644 --- a/lib/embedded_ansible.rb +++ b/lib/embedded_ansible.rb @@ -94,7 +94,7 @@ def self.api_connection def self.run_setup_script(exclude_tags) json_extra_vars = { - :awx_install_memcached_bind => MiqMemcached.server_address, + :awx_install_memcached_bind => ::Settings.session.memcache_server, :minimum_var_space => 0, :http_port => HTTP_PORT, :https_port => HTTPS_PORT, diff --git a/spec/lib/embedded_ansible_spec.rb b/spec/lib/embedded_ansible_spec.rb index 230a75ca5405..c7573c0dea40 100644 --- a/spec/lib/embedded_ansible_spec.rb +++ b/spec/lib/embedded_ansible_spec.rb @@ -128,7 +128,7 @@ let(:miq_database) { MiqDatabase.first } let(:extra_vars) do { - :awx_install_memcached_bind => MiqMemcached.server_address, + :awx_install_memcached_bind => ::Settings.session.memcache_server, :minimum_var_space => 0, :http_port => described_class::HTTP_PORT, :https_port => described_class::HTTPS_PORT,