Skip to content
This repository has been archived by the owner on Nov 11, 2019. It is now read-only.

Commit

Permalink
Merge pull request #485 from jsuchome/rpm-not-pip
Browse files Browse the repository at this point in the history
Airship deployer: install python packages as rpm, not from pip [ SOC-9494 ]
  • Loading branch information
jgu17 authored Jun 12, 2019
2 parents 616e476 + e1b8887 commit 2aaa7f6
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
13 changes: 7 additions & 6 deletions playbooks/roles/airship-setup-deployer/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@ suse_airship_deploy_packages:
- uuid-runtime
- docker
- curl
- python2-setuptools
- python2-pip
- python3-setuptools
- python3-pip
- python3-cmd2
- python-devel

suse_airship_deploy_python_libs:
- "cmd2<=0.8.7"
- python-openstackclient
- python-heatclient
suse_airship_openstackclient_packages:
- python3-barbicanclient
- python3-heatclient
- python3-openstackclient

# Keep this until helm is packaged as rpm
helm_download_url: "https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get"
9 changes: 4 additions & 5 deletions playbooks/roles/airship-setup-deployer/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,11 @@
tags:
- install

- name: Pip install python libraries
- name: Install OpenStack client packages
become: yes
pip:
name: "{{ suse_airship_deploy_python_libs }}"
register: install_python_libs
until: install_python_libs is success
package:
name: "{{ suse_airship_openstackclient_packages }}"
state: present
retries: 5
delay: 2
tags:
Expand Down

0 comments on commit 2aaa7f6

Please sign in to comment.