diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-07-12 20:17:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-07-12 20:17:44 +0000 |
| commit | 0c07a26ae0a45e7c08796876f589d03e6a3636ec (patch) | |
| tree | caa127b226ad4ed0308ca0d526f10dc67d9a8d42 /puppet/ceph-cluster-config.yaml | |
| parent | 4789de6b314d56440e023bbc5956662b94a2c3f3 (diff) | |
| parent | 0415a2a82bc1b72570a8e10a6384fc5a9f34b04f (diff) | |
Merge "Gnocchi composable roles"
Diffstat (limited to 'puppet/ceph-cluster-config.yaml')
| -rw-r--r-- | puppet/ceph-cluster-config.yaml | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/puppet/ceph-cluster-config.yaml b/puppet/ceph-cluster-config.yaml index 2e329989..db1fd09d 100644 --- a/puppet/ceph-cluster-config.yaml +++ b/puppet/ceph-cluster-config.yaml @@ -5,9 +5,6 @@ parameters: NovaRbdPoolName: default: vms type: string - GnocchiRbdPoolName: - default: metrics - type: string CephClientUserName: default: openstack type: string @@ -23,21 +20,12 @@ resources: ceph_cluster: mapped_data: nova::compute::rbd::libvirt_images_rbd_pool: {get_param: NovaRbdPoolName} - gnocchi::storage::ceph::ceph_pool: {get_param: GnocchiRbdPoolName} - gnocchi::storage::ceph::ceph_username: {get_param: CephClientUserName} nova::compute::rbd::libvirt_rbd_user: {get_param: CephClientUserName} nova::compute::rbd::rbd_keyring: list_join: - '.' - - 'client' - {get_param: CephClientUserName} - gnocchi::storage::ceph::ceph_keyring: - list_join: - - '.' - - - '/etc/ceph/ceph' - - 'client' - - {get_param: CephClientUserName} - - 'keyring' outputs: config_id: |