From 191ec4f40f18c3bf65ec4ecd5bf9e04f4545219a Mon Sep 17 00:00:00 2001
From: Seena Fallah <seenafallah@gmail.com>
Date: Wed, 15 Sep 2021 17:23:04 +0430
Subject: [PATCH] cephadm: install cephadm from repository

Signed-off-by: Seena Fallah <seenafallah@gmail.com>
(cherry picked from commit 582293625237c1c02dd28a05097783a2c42e665e)
---
 infrastructure-playbooks/cephadm.yml | 32 +++++++++++++++++-----------
 tox.ini                              |  2 --
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/infrastructure-playbooks/cephadm.yml b/infrastructure-playbooks/cephadm.yml
index 396ee844b..95b7feefc 100644
--- a/infrastructure-playbooks/cephadm.yml
+++ b/infrastructure-playbooks/cephadm.yml
@@ -102,24 +102,32 @@
         tasks_from: registry.yml
       when: ceph_docker_registry_auth | bool
 
+    - name: configure repository for installing cephadm
+      vars:
+        ceph_origin: repository
+        ceph_repository: community
+      block:
+        - name: validate repository variables
+          import_role:
+            name: ceph-validate
+            tasks_from: check_repository.yml
+
+        - name: configure repository
+          import_role:
+            name: ceph-common
+            tasks_from: "configure_repository.yml"
+
     - name: install cephadm requirements
       package:
         name: ['python3', 'lvm2']
       register: result
       until: result is succeeded
 
-    - name: create a cephadm container
-      command: "{{ container_binary }} create --name cephadm {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
-      changed_when: false
-
-    - name: cp the cephadm cli file
-      command: "{{ container_binary }} cp cephadm:/usr/sbin/cephadm /usr/sbin/cephadm"
-      args:
-        creates: /usr/sbin/cephadm
-
-    - name: remove the cephadm container
-      command: "{{ container_binary }} rm cephadm"
-      changed_when: false
+    - name: install cephadm
+      package:
+        name: cephadm
+      register: result
+      until: result is succeeded
 
     - name: set_fact cephadm_cmd
       set_fact:
diff --git a/tox.ini b/tox.ini
index def8cda16..9124558c0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -251,13 +251,11 @@ commands=
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/cephadm-adopt.yml --extra-vars "\
       ireallymeanit=yes \
       delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
-      ceph_repository=dev \
   "
   # idempotency test
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/cephadm-adopt.yml --extra-vars "\
       ireallymeanit=yes \
       delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
-      ceph_repository=dev \
   "
 
 [testenv]