diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-11-16 16:23:14 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-11-16 16:23:14 +0000 |
commit | e171ef1b684ee8dcc13b30586f11f5ccb54eba98 (patch) | |
tree | 749b775fcf21696874ec0bda949d349cc8289d5e | |
parent | e6ddc5fe34bb3f5b1899d8bf43335a14a5ec89ae (diff) | |
parent | 277fbae3213a077b860915be78487912adcd18d9 (diff) |
Merge "Do not manage overcloud repositories when using external Ceph"
-rw-r--r-- | puppet/services/ceph-external.yaml | 8 |
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]} |