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

diff --git a/puppet/services/ceph-external.yaml b/puppet/services/ceph-external.yaml
index 9120687..b708665 100644 (file)
--- 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]}