Increase node_timeout in gate

Give storage nodes more time to complete requests for multi-node upgrade
and probetests.

Also slightly decouple probetests from default configs.

Change-Id: I334ef517d833916a3b7be3151a812d4f9c66a6e1

test/probe/common.py

@@ -363,6 +363,9 @@ class ProbeTest(unittest.TestCase):
             server='object',
             ipport2server=self.ipport2server,
             config_paths=self.configs)
+        for server in Manager(['proxy-server']):
+            for conf in server.conf_files():
+                self.configs['proxy-server'] = conf
 
     def setUp(self):
         resetswift()
@@ -377,7 +380,10 @@ class ProbeTest(unittest.TestCase):
             Manager(['main']).start(wait=True)
             for ipport in self.ipport2server:
                 check_server(ipport, self.ipport2server)
-            proxy_ipport = ('127.0.0.1', 8080)
+            proxy_conf = readconf(self.configs['proxy-server'],
+                                  section_name='app:proxy-server')
+            proxy_ipport = (proxy_conf.get('bind_ip', '127.0.0.1'),
+                            int(proxy_conf.get('bind_port', 8080)))
             self.ipport2server[proxy_ipport] = 'proxy'
             self.url, self.token, self.account = check_server(
                 proxy_ipport, self.ipport2server)

test/probe/test_container_failures.py

@@ -163,9 +163,12 @@ class TestContainerFailures(ReplProbeTest):
             else:
                 client.delete_container(self.url, self.token, container)
 
+        proxy_conf = readconf(self.configs['proxy-server'],
+                              section_name='app:proxy-server')
+        node_timeout = int(proxy_conf.get('node_timeout', 10))
         pool = GreenPool()
         try:
-            with Timeout(15):
+            with Timeout(node_timeout + 5):
                 pool.spawn(run_test, 1, False)
                 pool.spawn(run_test, 2, True)
                 pool.spawn(run_test, 3, True)

tools/playbooks/multinode_setup/make_rings.yaml

@@ -53,6 +53,7 @@
         cmd: |
           crudini --set /etc/swift/proxy-server.conf DEFAULT bind_ip {{ hostvars['proxy1'].nodepool.public_ipv4 }}
           crudini --set /etc/swift/proxy-server.conf DEFAULT user {{ ansible_user_id }}
+          crudini --set /etc/swift/proxy-server.conf app:proxy-server node_timeout 20
         executable: /bin/bash
 
 - hosts: account

tools/playbooks/saio_single_node_setup/setup_saio.yaml

@@ -152,6 +152,12 @@
       replace: dest={{ item.path }} regexp=<your-user-name> replace={{ ansible_user_id }}
       with_items: "{{ find_result.files }}"
 
+    - name: set the options in the proxy config file
+      shell:
+        cmd: |
+          crudini --set /etc/swift/proxy-server.conf app:proxy-server node_timeout 20
+        executable: /bin/bash
+
     - name: copy the SAIO scripts for resetting the environment
       command: cp -r {{ zuul.project.src_dir }}/doc/saio/bin /home/{{ ansible_ssh_user }}/bin creates=/home/{{ ansible_ssh_user }}/bin