diff options
| author |   Giulio Fidente <gfidente@redhat.com> | 2015-03-27 16:13:59 -0400 |
|---|---|---|
| committer | Giulio Fidente <gfidente@redhat.com> | 2015-03-27 18:36:10 -0400 |
| commit | b0fea9137191704f0763cf2fd892570ec560fce9 (patch) | |
| tree | 416120c1750d9dc9bd44be421785c4617dc8a82e /puppet/manifests | |
| parent | fed9d001ccc92a6d3392cb959416596b6df83d99 (diff) | |
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
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_cephstorage.pp | 3 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_compute.pp | 6 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 10 |
3 files changed, 0 insertions, 19 deletions
diff --git a/puppet/manifests/overcloud_cephstorage.pp b/puppet/manifests/overcloud_cephstorage.pp index c0f19e23..ce2ab3af 100644 --- a/puppet/manifests/overcloud_cephstorage.pp +++ b/puppet/manifests/overcloud_cephstorage.pp @@ -28,8 +28,5 @@ if count(hiera('ntp::servers')) > 0 { include ::ntp } -class { 'ceph::profile::params': - mon_initial_members => downcase(hiera('ceph_mon_initial_members')) -} include ::ceph::profile::client include ::ceph::profile::osd
\ No newline at end of file diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp index eef468da..c9c87848 100644 --- a/puppet/manifests/overcloud_compute.pp +++ b/puppet/manifests/overcloud_compute.pp @@ -46,12 +46,6 @@ $nova_enable_rbd_backend = hiera('nova_enable_rbd_backend', false) if $nova_enable_rbd_backend { include ::ceph::profile::client include ::nova::compute::rbd - 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 => 'nova', - } } include ::nova::compute::libvirt 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 { |