diff options
| author | Zuul <zuul@review.opendev.org> | 2019-04-30 22:12:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-04-30 22:12:01 +0000 |
| commit | f55167a735632cdc89fb6f83f97e4fe3ed09b7cc (patch) | |
| tree | f74a7cd657ec540e4bde7aa8032a913a65b33967 /tools | |
| parent | 58352b285d6532321c6dfbe0e94218799c615ef2 (diff) | |
| parent | 771963c92654338011d3dc907044b2ee3f405dd3 (diff) | |
| download | swift-f55167a735632cdc89fb6f83f97e4fe3ed09b7cc.tar.gz | |
Merge "Increase node_timeout in gate"
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/playbooks/multinode_setup/make_rings.yaml | 1 | ||||
| -rw-r--r-- | tools/playbooks/saio_single_node_setup/setup_saio.yaml | 6 |
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 |