diff --git a/tasks/swift_install.yml b/tasks/swift_install.yml index 2175dff4..f0c53d8d 100644 --- a/tasks/swift_install.yml +++ b/tasks/swift_install.yml @@ -65,14 +65,13 @@ - name: Install requires pip packages pip: - name: "{{ item }}" + name: "{{ swift_requires_pip_packages | join(' ') }}" state: latest extra_args: "{{ pip_install_options_fact }}" register: install_packages until: install_packages|success retries: 5 delay: 2 - with_items: "{{ swift_requires_pip_packages }}" tags: - swift-install - swift-pip-packages @@ -169,7 +168,7 @@ - name: Install pip packages pip: - name: "{{ item }}" + name: "{{ swift_pip_packages | join(' ') }}" state: latest virtualenv: "{{ swift_bin | dirname }}" virtualenv_site_packages: "no" @@ -178,7 +177,6 @@ until: install_packages|success retries: 5 delay: 2 - with_items: "{{ swift_pip_packages }}" when: - not swift_pypy_enabled | bool - swift_get_venv | failed or swift_developer_mode | bool diff --git a/tasks/swift_pypy_setup.yml b/tasks/swift_pypy_setup.yml index 8142d2bd..2f2090ce 100644 --- a/tasks/swift_pypy_setup.yml +++ b/tasks/swift_pypy_setup.yml @@ -63,7 +63,7 @@ - name: Install pip packages into pypy venv pip: - name: "{{ item }}" + name: "{{ swift_pip_packages | join(' ') }}" state: latest virtualenv: "{{ swift_bin | dirname }}" virtualenv_site_packages: "no" @@ -73,7 +73,6 @@ until: install_packages|success retries: 5 delay: 2 - with_items: "{{ swift_pip_packages }}" notify: - Restart swift account services - Restart swift container services