diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-11-01 11:23:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-11-01 11:23:19 +0000 |
| commit | fef327412e6c99db16b8ed6111a98bffc1059b65 (patch) | |
| tree | 3a45bc4c9b12f51fe114a06b1d29468410a40940 /manifests/profile/base | |
| parent | afa29a585b94035c85106186a34decf8c3d07002 (diff) | |
| parent | ad4e331917a2da9f2fd8215369736896348244fd (diff) | |
Merge "NFS mounting for Glance file backend"
Diffstat (limited to 'manifests/profile/base')
| -rw-r--r-- | manifests/profile/base/glance/api.pp | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/manifests/profile/base/glance/api.pp b/manifests/profile/base/glance/api.pp index f3db396..a7d4487 100644 --- a/manifests/profile/base/glance/api.pp +++ b/manifests/profile/base/glance/api.pp @@ -22,6 +22,10 @@ # (Optional) Glance backend(s) to use. # Defaults to downcase(hiera('glance_backend', 'swift')) # +# [*glance_nfs_enabled*] +# (Optional) Whether to use NFS mount as 'file' backend storage location. +# Defaults to false +# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. @@ -36,12 +40,17 @@ # Defaults to hiera('glance::notify::rabbitmq::rabbit_port', 5672) class tripleo::profile::base::glance::api ( - $glance_backend = downcase(hiera('glance_backend', 'swift')), - $step = hiera('step'), - $rabbit_hosts = hiera('rabbitmq_node_ips', undef), - $rabbit_port = hiera('glance::notify::rabbitmq::rabbit_port', 5672), + $glance_backend = downcase(hiera('glance_backend', 'swift')), + $glance_nfs_enabled = false, + $step = hiera('step'), + $rabbit_hosts = hiera('rabbitmq_node_ips', undef), + $rabbit_port = hiera('glance::notify::rabbitmq::rabbit_port', 5672), ) { + if $step >= 1 and $glance_nfs_enabled { + include ::tripleo::glance::nfs_mount + } + if $step >= 4 { case $glance_backend { 'swift': { $backend_store = 'glance.store.swift.Store' } |