From 57b4e76d11e0e3bb58c299ae5d37617ea06e2c17 Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Fri, 15 Mar 2019 10:18:48 -0400 Subject: [PATCH] rolling_update: Remove ceph aliases ceph aliases have been introduced in stable-3.2 during the ceph deployment. On master this has been removed but we don't handle this removal in the upgrade from stable-3.2 to master via the rolling_update playbook. Also remove the task from purge-docker-cluster missing from d9e7835 Signed-off-by: Dimitri Savineau --- infrastructure-playbooks/purge-docker-cluster.yml | 5 ----- infrastructure-playbooks/rolling_update.yml | 7 +++++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/infrastructure-playbooks/purge-docker-cluster.yml b/infrastructure-playbooks/purge-docker-cluster.yml index c41a6e9dd..04d0587c0 100644 --- a/infrastructure-playbooks/purge-docker-cluster.yml +++ b/infrastructure-playbooks/purge-docker-cluster.yml @@ -568,11 +568,6 @@ remove_img ignore_errors: true - - name: remove ceph aliases - file: - path: /etc/profile.d/ceph-aliases.sh - state: absent - - name: check container hosts hosts: diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml index 8625927b0..0ec4ccf20 100644 --- a/infrastructure-playbooks/rolling_update.yml +++ b/infrastructure-playbooks/rolling_update.yml @@ -83,6 +83,13 @@ serial: 1 become: True tasks: + - name: remove ceph aliases + file: + path: /etc/profile.d/ceph-aliases.sh + state: absent + when: + - containerized_deployment + - name: set mon_host_count set_fact: mon_host_count: "{{ groups[mon_group_name] | length }}"