From b0fea9137191704f0763cf2fd892570ec560fce9 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Fri, 27 Mar 2015 16:13:59 -0400 Subject: Restructure Ceph/Puppet params to reflect changes in puppet-ceph A change [1] in puppet-ceph offers more flexibility but breaks backwards so we had to update our composition layer as well; we gain control of the cephx keyring in the template though. 1. Ie6adbd601388ab52c37037004bd0ceef9fc41942 Change-Id: Ia8196849afce2969daa608828cec81ebe3ac96e1 --- puppet/manifests/overcloud_controller.pp | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'puppet/manifests/overcloud_controller.pp') diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 41363039..1c88bae3 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -166,16 +166,6 @@ if hiera('step') >= 2 { include ::ceph::profile::mon } - if $cinder_enable_rbd_backend { - ceph::key { 'client.openstack' : - secret => hiera('ceph::profile::params::mon_key'), - cap_mon => hiera('ceph_openstack_default_cap_mon'), - cap_osd => hiera('ceph_openstack_default_cap_osd'), - user => 'cinder', - inject => 'true', - } - } - } #END STEP 2 if hiera('step') >= 3 { -- cgit 1.2.3-korg