From 53b2300996cc8f4f811d4eb67f18f198026da67a Mon Sep 17 00:00:00 2001 From: Nick Carboni Date: Mon, 30 Apr 2018 12:00:35 -0400 Subject: [PATCH] Add a memcached bind address for tower This prevents newer versions of the ansible tower setup playbook from making memcached bind to a local socket rather than to tcp localhost. --- lib/embedded_ansible/appliance_embedded_ansible.rb | 9 +++++---- .../embedded_ansible/appliance_embedded_ansible_spec.rb | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/embedded_ansible/appliance_embedded_ansible.rb b/lib/embedded_ansible/appliance_embedded_ansible.rb index f4bcbe570bc..6a1e8f18071 100644 --- a/lib/embedded_ansible/appliance_embedded_ansible.rb +++ b/lib/embedded_ansible/appliance_embedded_ansible.rb @@ -82,10 +82,11 @@ def services def 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/appliance_embedded_ansible_spec.rb b/spec/lib/embedded_ansible/appliance_embedded_ansible_spec.rb index df3238beabf..817a58bb4da 100644 --- a/spec/lib/embedded_ansible/appliance_embedded_ansible_spec.rb +++ b/spec/lib/embedded_ansible/appliance_embedded_ansible_spec.rb @@ -124,10 +124,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