From e7aae2780165c4db8b294f35ceb90af1f2b0b162 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Mon, 16 May 2016 18:37:28 +0200 Subject: [PATCH 1/3] ceph-common: fix ceph options default path again MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit closes: #788 Signed-off-by: Sébastien Han --- roles/ceph-common/tasks/main.yml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml index 6cc13dee3..8bb88db06 100644 --- a/roles/ceph-common/tasks/main.yml +++ b/roles/ceph-common/tasks/main.yml @@ -231,10 +231,30 @@ line: "CLUSTER={{ cluster }}" when: ansible_os_family == "RedHat" +- name: check /etc/default/ceph exist + stat: + path: /etc/default/ceph + register: etc_default_ceph + when: ansible_os_family == "Debian" + - name: configure cluster name lineinfile: dest: /etc/default/ceph insertafter: EOF create: yes line: "CLUSTER={{ cluster }}" - when: ansible_os_family == "Debian" + when: + - ansible_os_family == "Debian" + - etc_default_ceph.stat.exists + - not etc_default_ceph.stat.isdir + +- name: configure cluster name + lineinfile: + dest: /etc/default/ceph/ceph + insertafter: EOF + create: yes + line: "CLUSTER={{ cluster }}" + when: + - ansible_os_family == "Debian" + - etc_default_ceph.stat.exists + - etc_default_ceph.stat.isdir From e071b773d8015476a9932fb8a90f6ffcf119d0b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Mon, 16 May 2016 18:55:54 +0200 Subject: [PATCH 2/3] ceph-common: add explanation message MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sébastien Han --- roles/ceph-common/tasks/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml index 8bb88db06..30a164df0 100644 --- a/roles/ceph-common/tasks/main.yml +++ b/roles/ceph-common/tasks/main.yml @@ -231,6 +231,11 @@ line: "CLUSTER={{ cluster }}" when: ansible_os_family == "RedHat" +# NOTE(leseb): we are performing the following check +# to ensure any Jewel installation will not fail. +# The following commit https://github.com/ceph/ceph/commit/791eba81a5467dd5de4f1680ed0deb647eb3fb8b +# fixed a package issue where the path was the wrong. +# This bug is not yet on all the distros package so we are working around it - name: check /etc/default/ceph exist stat: path: /etc/default/ceph From 1d5d438e5d44b066554505b191d92d22e4b56f0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Tue, 17 May 2016 11:47:25 +0200 Subject: [PATCH 3/3] ceph-common: list impacted versions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For the ceph option default path Signed-off-by: Sébastien Han --- roles/ceph-common/tasks/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml index 30a164df0..a173782fa 100644 --- a/roles/ceph-common/tasks/main.yml +++ b/roles/ceph-common/tasks/main.yml @@ -236,6 +236,11 @@ # The following commit https://github.com/ceph/ceph/commit/791eba81a5467dd5de4f1680ed0deb647eb3fb8b # fixed a package issue where the path was the wrong. # This bug is not yet on all the distros package so we are working around it +# Impacted versions: +# - Jewel from UCA: https://bugs.launchpad.net/ubuntu/+source/ceph/+bug/1582773 +# - Jewel from latest Canonical 16.04 distro +# - All previous versions from Canonical +# - Infernalis from ceph.com - name: check /etc/default/ceph exist stat: path: /etc/default/ceph