summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-01-07 23:59:30 +0000
committerGerrit Code Review <review@openstack.org>2016-01-07 23:59:30 +0000
commit7c7a604893b4f0e9345dc93e6c80ebe916e0cb59 (patch)
treecef574cc5bee624c7e7b3b7bb5e8e91a8093e679 /puppet
parente1484c6e2fc4052a51e07b9e1847777d57d2ccda (diff)
parenta27cca0ec38131dad67f6277f13114685b96d9f7 (diff)
Merge "updating enable_ceph conditions for controller"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/manifests/overcloud_controller.pp2
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp2
2 files changed, 2 insertions, 2 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 5541734f..96fdb4f6 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -130,7 +130,7 @@ if hiera('step') >= 2 {
# pre-install swift here so we can build rings
include ::swift
- $enable_ceph = hiera('ceph_storage_count', 0) > 0
+ $enable_ceph = hiera('ceph_storage_count', 0) > 0 or hiera('enable_ceph_storage', false)
if $enable_ceph {
class { '::ceph::profile::params':
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 3ce94315..73fc6faa 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -451,7 +451,7 @@ MYSQL_HOST=localhost\n",
include ::swift
# Ceph
- $enable_ceph = hiera('ceph_storage_count', 0) > 0
+ $enable_ceph = hiera('ceph_storage_count', 0) > 0 or hiera('enable_ceph_storage', false)
if $enable_ceph {
class { '::ceph::profile::params':