aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/hieradata
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-11 15:29:28 +0000
committerGerrit Code Review <review@openstack.org>2015-11-11 15:29:28 +0000
commit1b22aed7054ca08e93d870bdc6103c36f97c4b17 (patch)
tree3928dda1c9ce09b385efeafb70ec1418c0d49749 /puppet/hieradata
parent7961f61a413eb36caf46677655cbf8af8bfb6303 (diff)
parent9ea7831eaeadced1b5599b6ef1feb01d0cb6dca2 (diff)
Merge "Allow customization of Ceph client user"
Diffstat (limited to 'puppet/hieradata')
-rw-r--r--puppet/hieradata/compute.yaml2
1 files changed, 0 insertions, 2 deletions
diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml
index 659008a5..173020f8 100644
--- a/puppet/hieradata/compute.yaml
+++ b/puppet/hieradata/compute.yaml
@@ -10,8 +10,6 @@ nova::compute::vnc_enabled: true
nova::compute::libvirt::vncserver_listen: '0.0.0.0'
nova::compute::libvirt::migration_support: true
-nova::compute::rbd::libvirt_rbd_user: 'openstack'
-nova::compute::rbd::rbd_keyring: 'client.openstack'
nova::compute::rbd::libvirt_rbd_secret_uuid: "%{hiera('ceph::profile::params::fsid')}"
ceilometer::agent::auth::auth_tenant_name: 'service'