Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Restore the NtpServer parameter name"
[apex-tripleo-heat-templates.git]
/
puppet
/
manifests
/
overcloud_cephstorage.pp
diff --git
a/puppet/manifests/overcloud_cephstorage.pp
b/puppet/manifests/overcloud_cephstorage.pp
index
ce2ab3a
..
152694d
100644
(file)
--- a/
puppet/manifests/overcloud_cephstorage.pp
+++ b/
puppet/manifests/overcloud_cephstorage.pp
@@
-13,20
+13,12
@@
# License for the specific language governing permissions and limitations
# under the License.
# License for the specific language governing permissions and limitations
# under the License.
-if !str2bool(hiera('enable_package_install', 'false')) {
- case $::osfamily {
- 'RedHat': {
- Package { provider => 'norpm' } # provided by tripleo-puppet
- }
- default: {
- warning('enable_package_install option not supported.')
- }
- }
-}
+include ::tripleo::packages
+include ::tripleo::firewall
-if
count(hiera('ntp::servers')) > 0
{
- include ::ntp
+if
hiera('step') >= 4
{
+ hiera_include('ceph_classes')
}
}
-include ::ceph::profile::client
-include ::ceph::profile::osd
\ No newline at end of file
+$package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_ceph', hiera('step')])
+package_manifest{$package_manifest_name: ensure => present}