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.
carbonin · Apr 30, 2018 · 53b2300 · 53b2300
1 parent 03f883c
commit 53b2300
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git 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
@@ -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