From: Giulio Fidente <gfidente@redhat.com>
Date: Wed, 15 Mar 2017 23:45:11 +0000 (+0100)
Subject: Include ceph::profile::client from rgw.pp
X-Git-Tag: opnfv-6.0.0~291^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ad1324c7acd4afa937ce41b6339e3dc817d0de25;p=apex-puppet-tripleo.git

Include ceph::profile::client from rgw.pp

To deploy successfully the RadosGW service on a dedicated node
it is necessary to provision on the node a CephX keyring with the
needed permissions to import the RadosGW service keyring. This
change will provision any keyring passed via client_keys.

It makes possible to deploy the CephRgw service on any custom role
without including the CephClient service.

Change-Id: I5772eeb233ca241887226145a472c7a0363249cb
Closes-Bug: #1673288
---

diff --git a/manifests/profile/base/ceph/rgw.pp b/manifests/profile/base/ceph/rgw.pp
index 8443de0..d00f7cd 100644
--- a/manifests/profile/base/ceph/rgw.pp
+++ b/manifests/profile/base/ceph/rgw.pp
@@ -60,7 +60,7 @@ class tripleo::profile::base::ceph::rgw (
     $rgw_name = hiera('ceph::profile::params::rgw_name', 'radosgw.gateway')
     $civetweb_bind_ip_real = normalize_ip_for_uri($civetweb_bind_ip)
     include ::ceph::params
-    include ::ceph::profile::base
+    include ::ceph::profile::client
     ceph::rgw { $rgw_name:
       frontend_type => 'civetweb',
       rgw_frontends => "civetweb port=${civetweb_bind_ip_real}:${civetweb_bind_port}",