From b8be0938077d7a3f46789524fe61f8c03badf567 Mon Sep 17 00:00:00 2001 From: John Fulton Date: Tue, 15 Nov 2016 11:35:27 -0500 Subject: [PATCH] Do not manage overcloud repositories when using external Ceph ceph::profile::params::manage_repo should default to false when using external Ceph. Overcloud Ceph clients use Ceph packages, which may be provided by the 'ceph' metapackage, but not for all repos, see related bug. So, this change also includes a list of packages as a workaround as used in change Ie55d22301dd22102d471e6002dfcaad4bfadd5f6. Change-Id: I338e51637aa39d3f7bbbad0263740f728d42cb9b Closes-bug: 1641989 Related-Bug: 1629933 (cherry picked from commit 277fbae3213a077b860915be78487912adcd18d9) --- puppet/services/ceph-external.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/puppet/services/ceph-external.yaml b/puppet/services/ceph-external.yaml index 9120687b95..b708665f2c 100644 --- a/puppet/services/ceph-external.yaml +++ b/puppet/services/ceph-external.yaml @@ -99,6 +99,14 @@ outputs: CINDERBACKUP_POOL: {get_param: CinderBackupRbdPoolName} GLANCE_POOL: {get_param: GlanceRbdPoolName} GNOCCHI_POOL: {get_param: GnocchiRbdPoolName} + ceph::profile::params::manage_repo: false + # FIXME(gfidente): we should not have to list the packages explicitly in + # the templates, but this should stay until the following is fixed: + # https://bugs.launchpad.net/puppet-ceph/+bug/1629933 + ceph::params::packages: + - ceph-base + - ceph-mon + - ceph-osd service_config_settings: glance_api: glance::api::show_multiple_locations: {if: [glance_multiple_locations, true, false]}