summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Fulton <fulton@redhat.com>2016-11-15 11:35:27 -0500
committerGiulio Fidente <gfidente@redhat.com>2016-11-16 10:42:29 +0000
commit277fbae3213a077b860915be78487912adcd18d9 (patch)
treef9645a77ebbf66f2f65ec1a8468a5a103dc27729
parent2f0dcc43b953709ff201ab0386a2178eb01df16f (diff)
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
-rw-r--r--puppet/services/ceph-external.yaml8
1 files changed, 8 insertions, 0 deletions
diff --git a/puppet/services/ceph-external.yaml b/puppet/services/ceph-external.yaml
index 9120687b..b708665f 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]}