From 58d1e814c658bb41c16023b95044b5bff3dd57af Mon Sep 17 00:00:00 2001
From: "binhong.hua" <huabinhong@unitedstack.com>
Date: Thu, 15 Mar 2018 22:34:17 +0800
Subject: [PATCH] remove OS::TripleO::Services::CephClient from CephAll
CephClient should be removed from the CephAll role.
The only thing it does is the key set which is already
handled by the ceph mon profile.
if not will cause Duplicate declaration: Class[Ceph::Keys]
Change-Id: I77bbec1edd21cd6a4212a381a1a7712adc4b604f
Related-Bug: 1722633
---
roles/CephAll.yaml | 1 -
tools/yaml-validate.py | 1 -
2 files changed, 2 deletions(-)
diff --git a/roles/CephAll.yaml b/roles/CephAll.yaml
index 6304dbd79f..6433b31049 100644
--- a/roles/CephAll.yaml
+++ b/roles/CephAll.yaml
@@ -12,7 +12,6 @@
- OS::TripleO::Services::Aide
- OS::TripleO::Services::AuditD
- OS::TripleO::Services::CACerts
- - OS::TripleO::Services::CephClient
- OS::TripleO::Services::CephMds
- OS::TripleO::Services::CephMgr
- OS::TripleO::Services::CephMon
diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py
index e2a5f211b8..16681243fb 100755
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@@ -275,7 +275,6 @@ def validate_ceph_role(ceph_role_filename, ceph_role_tpl):
for role in ceph_role_tpl:
if role['name'] == 'CephAll':
ceph_role_services = role['ServicesDefault']
- ceph_role_services.remove('OS::TripleO::Services::CephClient')
ceph_role_services.remove('OS::TripleO::Services::CephMds')
ceph_role_services.remove('OS::TripleO::Services::CephMgr')
ceph_role_services.remove('OS::TripleO::Services::CephMon')