summaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-04-02 07:33:08 +0000
committerGerrit Code Review <review@openstack.org>2015-04-02 07:33:08 +0000
commit61fecfc5754c3d08e38853782fdb875d1156e3b3 (patch)
tree38af04f52f4f1072f09c51fafd3766ae654c74ea /puppet/manifests
parent9bf344f4786e343f5670addf3819c87cf2bc484d (diff)
parentb0fea9137191704f0763cf2fd892570ec560fce9 (diff)
Merge "Restructure Ceph/Puppet params to reflect changes in puppet-ceph"
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_cephstorage.pp3
-rw-r--r--puppet/manifests/overcloud_compute.pp6
-rw-r--r--puppet/manifests/overcloud_controller.pp10
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 d02725ab..58834039 100644
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -53,12 +53,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 b08769ad..08f06a98 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -151,16 +151,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 {