summaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-24 14:09:57 +0000
committerGerrit Code Review <review@openstack.org>2015-07-24 14:09:57 +0000
commitd982240bde03ca8624f94dbc46ff772f48fa255a (patch)
treef0fd0a6e9c48e6ca19414ce399c5d194e6db11e2 /puppet/manifests
parente74b9fb33e2af161907eb92715af8091aa547fe3 (diff)
parentc8c11a09f028ea763328d77ac334796caa4e4cbd (diff)
Merge "NFS backend for Cinder"
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_compute.pp11
-rw-r--r--puppet/manifests/overcloud_controller.pp20
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp20
3 files changed, 49 insertions, 2 deletions
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index d36cf0b0..e6fa9471 100644
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -53,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
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 46f2641b..27b7328d 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -365,7 +365,25 @@ if hiera('step') >= 3 {
}
}
- $cinder_enabled_backends = delete_undef_values([$cinder_iscsi_backend, $cinder_rbd_backend, $cinder_netapp_backend])
+ if hiera('cinder_enable_nfs_backend', false) {
+ $cinder_nfs_backend = 'tripleo_nfs'
+
+ if ($::selinux != "false") {
+ selboolean { 'virt_use_nfs':
+ value => on,
+ persistent => true,
+ } -> Package['nfs-utils']
+ }
+
+ package {'nfs-utils': } ->
+ cinder::backend::nfs { $cinder_nfs_backend :
+ nfs_servers => hiera('cinder_nfs_servers'),
+ nfs_mount_options => hiera('cinder_nfs_mount_options'),
+ nfs_shares_config => '/etc/cinder/shares-nfs.conf',
+ }
+ }
+
+ $cinder_enabled_backends = delete_undef_values([$cinder_iscsi_backend, $cinder_rbd_backend, $cinder_netapp_backend, $cinder_nfs_backend])
class { '::cinder::backends' :
enabled_backends => $cinder_enabled_backends,
}
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 5bd16e4c..5f5b06dd 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -724,7 +724,25 @@ if hiera('step') >= 3 {
}
}
- $cinder_enabled_backends = delete_undef_values([$cinder_iscsi_backend, $cinder_rbd_backend, $cinder_netapp_backend])
+ if hiera('cinder_enable_nfs_backend', false) {
+ $cinder_nfs_backend = 'tripleo_nfs'
+
+ if ($::selinux != "false") {
+ selboolean { 'virt_use_nfs':
+ value => on,
+ persistent => true,
+ } -> Package['nfs-utils']
+ }
+
+ package {'nfs-utils': } ->
+ cinder::backend::nfs { $cinder_nfs_backend:
+ nfs_servers => hiera('cinder_nfs_servers'),
+ nfs_mount_options => hiera('cinder_nfs_mount_options'),
+ nfs_shares_config => '/etc/cinder/shares-nfs.conf',
+ }
+ }
+
+ $cinder_enabled_backends = delete_undef_values([$cinder_iscsi_backend, $cinder_rbd_backend, $cinder_netapp_backend, $cinder_nfs_backend])
class { '::cinder::backends' :
enabled_backends => $cinder_enabled_backends,
}