summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorClay Gerrard <clay.gerrard@gmail.com>2019-02-11 14:43:01 -0600
committerClay Gerrard <clay.gerrard@gmail.com>2019-02-12 10:39:17 -0600
commit771963c92654338011d3dc907044b2ee3f405dd3 (patch)
tree38123012dcb81fd99dbc37cc611234b1f01017de /tools
parent64e5fd364ae044ebfda541fd90bb3551bab36dcb (diff)
downloadswift-771963c92654338011d3dc907044b2ee3f405dd3.tar.gz
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
Diffstat (limited to 'tools')
-rw-r--r--tools/playbooks/multinode_setup/make_rings.yaml1
-rw-r--r--tools/playbooks/saio_single_node_setup/setup_saio.yaml6
2 files changed, 7 insertions, 0 deletions
diff --git a/tools/playbooks/multinode_setup/make_rings.yaml b/tools/playbooks/multinode_setup/make_rings.yaml
index 8bdd344a7..302ef3bab 100644
--- a/tools/playbooks/multinode_setup/make_rings.yaml
+++ b/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
diff --git a/tools/playbooks/saio_single_node_setup/setup_saio.yaml b/tools/playbooks/saio_single_node_setup/setup_saio.yaml
index e809e459f..070cdde26 100644
--- a/tools/playbooks/saio_single_node_setup/setup_saio.yaml
+++ b/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