diff options
| -rw-r--r-- | tools/playbooks/common/install_dependencies.yaml | 15 | ||||
| -rw-r--r-- | tools/playbooks/saio_single_node_setup/make_rings.yaml | 7 |
2 files changed, 17 insertions, 5 deletions
diff --git a/tools/playbooks/common/install_dependencies.yaml b/tools/playbooks/common/install_dependencies.yaml index bbec2d540..d89aeb9fd 100644 --- a/tools/playbooks/common/install_dependencies.yaml +++ b/tools/playbooks/common/install_dependencies.yaml @@ -14,17 +14,28 @@ # limitations under the License. - hosts: all become: true + roles: + - ensure-pip tasks: + - name: upgrade pip, but not too far + pip: + # 20.* works on both py2 and py3, and the pip for centos7 in EPEL + # isn't smart enough to prevent us upgrading to 21+ + name: pip<21 + extra_args: --upgrade + - name: installing dependencies yum: name={{ item }} state=present with_items: - python-pyeclib - - python-pip - python-nose - python-swiftclient - name: install python modules with pip pip: name={{ item }} state=present extra_args='--upgrade' with_items: - - crudini + # crudini pulls in iniparse which can conflict with distro-installed + # packages on centos7 + - 'crudini<0.9.4' + # Order matters; install constrained versions *first*, then unconstrained - eventlet diff --git a/tools/playbooks/saio_single_node_setup/make_rings.yaml b/tools/playbooks/saio_single_node_setup/make_rings.yaml index 65c469a23..f68a7a47c 100644 --- a/tools/playbooks/saio_single_node_setup/make_rings.yaml +++ b/tools/playbooks/saio_single_node_setup/make_rings.yaml @@ -17,10 +17,11 @@ tasks: - name: install swift become: true - shell: - cmd: python setup.py develop - executable: /bin/bash + pip: + state: present + name: . chdir: '{{ zuul.project.src_dir }}' + editable: true - name: make rings shell: |