From 4e6ae8b8c099ac3bd3bb1e71638f9e2ecd3f9e4a 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 ec1dce21256d4bc4451beb74a8939bdae8667892)
---
 infrastructure-playbooks/cephadm.yml          | 32 ++++++++++++-------
 .../ceph-validate/tasks/check_repository.yml  |  4 +--
 2 files changed, 22 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/roles/ceph-validate/tasks/check_repository.yml b/roles/ceph-validate/tasks/check_repository.yml
index ec3c124e4..b680de95d 100644
--- a/roles/ceph-validate/tasks/check_repository.yml
+++ b/roles/ceph-validate/tasks/check_repository.yml
@@ -12,8 +12,8 @@
 
 - name: validate ceph_repository_community
   fail:
-    msg: "ceph_stable_release must be 'quincy'"
+    msg: "ceph_stable_release must be 'pacific'"
   when:
     - ceph_origin == 'repository'
     - ceph_repository == 'community'
-    - ceph_stable_release not in ['quincy']
+    - ceph_stable_release not in ['pacific']
-- 
2.47.3