summaryrefslogtreecommitdiff
path: root/tools/playbooks
diff options
context:
space:
mode:
Diffstat (limited to 'tools/playbooks')
-rw-r--r--tools/playbooks/common/install_dependencies.yaml3
-rw-r--r--tools/playbooks/dsvm/pre.yaml2
-rw-r--r--tools/playbooks/saio_single_node_setup/setup_saio.yaml10
3 files changed, 10 insertions, 5 deletions
diff --git a/tools/playbooks/common/install_dependencies.yaml b/tools/playbooks/common/install_dependencies.yaml
index a99ead44f..d48905aab 100644
--- a/tools/playbooks/common/install_dependencies.yaml
+++ b/tools/playbooks/common/install_dependencies.yaml
@@ -14,12 +14,13 @@
# limitations under the License.
- hosts: all
become: true
+ roles:
+ - ensure-pip
tasks:
- name: installing dependencies
package: name={{ item }} state=present
with_items:
- python-pyeclib
- - python-pip
- python-nose
- python-swiftclient
diff --git a/tools/playbooks/dsvm/pre.yaml b/tools/playbooks/dsvm/pre.yaml
index 351e28097..23c6ec2d2 100644
--- a/tools/playbooks/dsvm/pre.yaml
+++ b/tools/playbooks/dsvm/pre.yaml
@@ -7,4 +7,6 @@
bindep_dir: "{{ zuul_work_dir }}"
- test-setup
- ensure-tox
+ - additional-tempauth-users
+ - additional-keystone-users
- dsvm-additional-middlewares
diff --git a/tools/playbooks/saio_single_node_setup/setup_saio.yaml b/tools/playbooks/saio_single_node_setup/setup_saio.yaml
index d27261e02..c6ba25b72 100644
--- a/tools/playbooks/saio_single_node_setup/setup_saio.yaml
+++ b/tools/playbooks/saio_single_node_setup/setup_saio.yaml
@@ -179,10 +179,12 @@
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
+ ini_file:
+ path: /etc/swift/proxy-server.conf
+ section: app:proxy-server
+ option: node_timeout
+ value: 20
+ create: no
- 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