diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-09-08 06:22:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-09-08 06:22:09 +0000 |
| commit | 896517755b917a5018e6529100d2cda5487a35d9 (patch) | |
| tree | 4e70d1a1b1bd43f04529033411570abc2d9d3fba /puppet | |
| parent | 75b14599e1ad498983ea43add369f04bbc97a198 (diff) | |
| parent | e6682e5b66d165a930e5a4a76e88289d7a1ce5e2 (diff) | |
Merge "Maintain ceph-osd package only on nodes hosting CephOSD service" into stable/pike
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/services/ceph-base.yaml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/puppet/services/ceph-base.yaml b/puppet/services/ceph-base.yaml index f6573f6c..8debf8c7 100644 --- a/puppet/services/ceph-base.yaml +++ b/puppet/services/ceph-base.yaml @@ -99,7 +99,6 @@ outputs: ceph::params::packages: - ceph-base - ceph-mon - - ceph-osd # NOTE: bind IP is found in Heat replacing the network name with the local node IP # for the given network; replacement examples (eg. for internal_api): # internal_api -> IP @@ -152,3 +151,9 @@ outputs: list_join: ['.', ['client', {get_param: CephClientUserName}]] MANILA_CLIENT_KEY: list_join: ['.', ['client', {get_param: ManilaCephFSNativeCephFSAuthId}]] + service_config_settings: + ceph_osd: + ceph::params::packages: + - ceph-base + - ceph-mon + - ceph-osd |