From e1b88877ccbb99e9f807f4ba278f29ce3a59e530 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Suchomel?= <jiri.suchomel@suse.com>
Date: Wed, 12 Jun 2019 09:44:40 +0200
Subject: [PATCH] Airship deployer: install python packages as rpm, not from
 pip

At this point deployer has repositories set up, no need for pip.
---
 .../roles/airship-setup-deployer/defaults/main.yml  | 13 +++++++------
 .../roles/airship-setup-deployer/tasks/main.yml     |  9 ++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/playbooks/roles/airship-setup-deployer/defaults/main.yml b/playbooks/roles/airship-setup-deployer/defaults/main.yml
index d11da5b58..489c609ef 100644
--- a/playbooks/roles/airship-setup-deployer/defaults/main.yml
+++ b/playbooks/roles/airship-setup-deployer/defaults/main.yml
@@ -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"
diff --git a/playbooks/roles/airship-setup-deployer/tasks/main.yml b/playbooks/roles/airship-setup-deployer/tasks/main.yml
index 5957e2739..93b795b86 100644
--- a/playbooks/roles/airship-setup-deployer/tasks/main.yml
+++ b/playbooks/roles/airship-setup-deployer/tasks/main.yml
@@ -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: