From b0975a501c41ac21c3d20e65a8e8b20f3f9aaa55 Mon Sep 17 00:00:00 2001 From: Balint Varga Date: Fri, 28 Jun 2019 14:33:48 +0200 Subject: [PATCH] do not set ceph if ceph not configured Signed-off-by: Balint Varga Change-Id: I57ef6b5f6c2650ec0796eff3b314b5f83cc64ba6 --- ansible/playbooks/kubernetes_ceph.yaml | 3 ++- caas-kubernetes.spec | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ansible/playbooks/kubernetes_ceph.yaml b/ansible/playbooks/kubernetes_ceph.yaml index e875ffc..f25d1e7 100644 --- a/ansible/playbooks/kubernetes_ceph.yaml +++ b/ansible/playbooks/kubernetes_ceph.yaml @@ -19,4 +19,5 @@ become: true become_user: "{{ users.admin_user_name }}" roles: - - kubernetes_ceph + - role: kubernetes_ceph + when: (ceph_configured | default(False)) diff --git a/caas-kubernetes.spec b/caas-kubernetes.spec index ce9df55..c57072c 100644 --- a/caas-kubernetes.spec +++ b/caas-kubernetes.spec @@ -15,7 +15,7 @@ %define COMPONENT kubernetes %define RPM_NAME caas-%{COMPONENT} %define RPM_MAJOR_VERSION 1.15.0 -%define RPM_MINOR_VERSION 2 +%define RPM_MINOR_VERSION 3 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} %define KUBERNETESPAUSE_VERSION 3.1 -- 2.16.6