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
Write package names out to flat files
[apex-tripleo-heat-templates.git]
/
puppet
/
manifests
/
overcloud_compute.pp
diff --git
a/puppet/manifests/overcloud_compute.pp
b/puppet/manifests/overcloud_compute.pp
index
67a73dd
..
fb5a352
100644
(file)
--- a/
puppet/manifests/overcloud_compute.pp
+++ b/
puppet/manifests/overcloud_compute.pp
@@
-13,16
+13,7
@@
# 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
create_resources(sysctl::value, hiera('sysctl_settings'), {})
create_resources(sysctl::value, hiera('sysctl_settings'), {})
@@
-44,6
+35,7
@@
exec { 'libvirt-default-net-destroy':
}
include ::nova
}
include ::nova
+include ::nova::config
include ::nova::compute
nova_config {
include ::nova::compute
nova_config {
@@
-61,6
+53,17
@@
if $nova_enable_rbd_backend {
}
}
}
}
+if hiera('cinder_enable_nfs_backend', false) {
+ if ($::selinux != "false") {
+ selboolean { 'virt_use_nfs':
+ value => on,
+ persistent => true,
+ } -> Package['nfs-utils']
+ }
+
+ package {'nfs-utils': } -> Service['nova-compute']
+}
+
include ::nova::compute::libvirt
include ::nova::network::neutron
include ::neutron
include ::nova::compute::libvirt
include ::nova::network::neutron
include ::neutron
@@
-90,3
+93,4
@@
class { 'snmp':
}
hiera_include('compute_classes')
}
hiera_include('compute_classes')
+package_manifest{'/var/lib/tripleo/installed-packages/overcloud_compute': ensure => present}