From 339212a7c602ba17538f091c4134ca73c1cd626b Mon Sep 17 00:00:00 2001 From: Seena Fallah Date: Thu, 5 Aug 2021 20:18:38 +0430 Subject: [PATCH] cephadm-adopt: configure repository for cephadm installation Configure repository for cephadm installation and use package install in both containerized and non containerized deployment Signed-off-by: Seena Fallah --- infrastructure-playbooks/cephadm-adopt.yml | 33 +++++++++---------- .../all_daemons/container/group_vars/all | 2 +- tox.ini | 2 ++ 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/infrastructure-playbooks/cephadm-adopt.yml b/infrastructure-playbooks/cephadm-adopt.yml index 95be47465..ac31a6b52 100644 --- a/infrastructure-playbooks/cephadm-adopt.yml +++ b/infrastructure-playbooks/cephadm-adopt.yml @@ -145,6 +145,22 @@ inventory_hostname in groups.get(iscsi_gw_group_name, []) or inventory_hostname in groups.get(nfs_group_name, []) + - name: configure repository for installing cephadm + when: containerized_deployment | bool + 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'] @@ -156,7 +172,6 @@ name: cephadm register: result until: result is succeeded - when: not containerized_deployment | bool - name: install cephadm mgr module package: @@ -167,22 +182,6 @@ - not containerized_deployment | bool - mgr_group_name in group_names - - name: get cephadm from the container image - when: containerized_deployment | bool - block: - - 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: set_fact ceph_cmd set_fact: ceph_cmd: "{{ container_binary + ' run --rm --net=host -v /etc/ceph:/etc/ceph:z -v /var/lib/ceph:/var/lib/ceph:z -v /var/run/ceph:/var/run/ceph:z --entrypoint=ceph ' + ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment | bool else 'ceph' }} --cluster {{ cluster }}" diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all index 09954352f..72406faa0 100644 --- a/tests/functional/all_daemons/container/group_vars/all +++ b/tests/functional/all_daemons/container/group_vars/all @@ -42,4 +42,4 @@ ceph_docker_image_tag: latest-master node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0" prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2" alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2" -grafana_container_image: "quay.ceph.io/app-sre/grafana:6.7.4" \ No newline at end of file +grafana_container_image: "quay.ceph.io/app-sre/grafana:6.7.4" diff --git a/tox.ini b/tox.ini index a0f34ca92..364d87f92 100644 --- a/tox.ini +++ b/tox.ini @@ -275,11 +275,13 @@ 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] -- 2.39.5