From 2e44b6af74c5b229b678a982cf1cd2ee65227f76 Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Mon, 7 Oct 2019 16:51:32 -0400 Subject: [PATCH] ceph-config: remove container_binary variable 9e7972a introduced a regression via the container_binary variable which is undefined. The CEPH_CONTAINER_BINARY environment variable isn't used at all. Signed-off-by: Dimitri Savineau --- infrastructure-playbooks/shrink-osd.yml | 1 - roles/ceph-config/tasks/main.yml | 2 -- 2 files changed, 3 deletions(-) diff --git a/infrastructure-playbooks/shrink-osd.yml b/infrastructure-playbooks/shrink-osd.yml index 89d0bc082..e5d8e8d5b 100644 --- a/infrastructure-playbooks/shrink-osd.yml +++ b/infrastructure-playbooks/shrink-osd.yml @@ -105,7 +105,6 @@ environment: CEPH_VOLUME_DEBUG: 1 CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else None }}" - CEPH_CONTAINER_BINARY: "{{ container_binary }}" delegate_to: "{{ item.0 }}" loop: "{{ osd_hosts }}" diff --git a/roles/ceph-config/tasks/main.yml b/roles/ceph-config/tasks/main.yml index fff2dd1bd..71ca1ad24 100644 --- a/roles/ceph-config/tasks/main.yml +++ b/roles/ceph-config/tasks/main.yml @@ -31,7 +31,6 @@ environment: CEPH_VOLUME_DEBUG: 1 CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else None }}" - CEPH_CONTAINER_BINARY: "{{ container_binary }}" when: - devices | default([]) | length > 0 - osd_scenario == 'lvm' @@ -51,7 +50,6 @@ environment: CEPH_VOLUME_DEBUG: 1 CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else None }}" - CEPH_CONTAINER_BINARY: "{{ container_binary }}" when: - devices | default([]) | length > 0 - osd_scenario == 'lvm' -- 2.39.5