From 75dc4767cbd056d7762c42627038de0d78a82d43 Mon Sep 17 00:00:00 2001 From: Brandon Dunne Date: Mon, 30 Apr 2018 13:11:58 -0400 Subject: [PATCH] Merge pull request #17366 from carbonin/add_memcached_bind_for_tower Add a memcached bind address for tower (cherry picked from commit 99deff84765b270233b53c256fa09233554cf372) --- lib/embedded_ansible.rb | 9 +++++---- spec/lib/embedded_ansible_spec.rb | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/embedded_ansible.rb b/lib/embedded_ansible.rb index 81d1ed10f3b..29592b40281 100644 --- a/lib/embedded_ansible.rb +++ b/lib/embedded_ansible.rb @@ -94,10 +94,11 @@ def self.api_connection def self.run_setup_script(exclude_tags) json_extra_vars = { - :minimum_var_space => 0, - :http_port => HTTP_PORT, - :https_port => HTTPS_PORT, - :tower_package_name => "ansible-tower-server" + :awx_install_memcached_bind => MiqMemcached.server_address, + :minimum_var_space => 0, + :http_port => HTTP_PORT, + :https_port => HTTPS_PORT, + :tower_package_name => "ansible-tower-server" }.to_json with_inventory_file do |inventory_file_path| diff --git a/spec/lib/embedded_ansible_spec.rb b/spec/lib/embedded_ansible_spec.rb index 16043f80516..230a75ca540 100644 --- a/spec/lib/embedded_ansible_spec.rb +++ b/spec/lib/embedded_ansible_spec.rb @@ -128,10 +128,11 @@ let(:miq_database) { MiqDatabase.first } let(:extra_vars) do { - :minimum_var_space => 0, - :http_port => described_class::HTTP_PORT, - :https_port => described_class::HTTPS_PORT, - :tower_package_name => "ansible-tower-server" + :awx_install_memcached_bind => MiqMemcached.server_address, + :minimum_var_space => 0, + :http_port => described_class::HTTP_PORT, + :https_port => described_class::HTTPS_PORT, + :tower_package_name => "ansible-tower-server" }.to_json end