Merge "Fix glance config generation when using NFS"

This commit is contained in:
Zuul 2017-11-24 13:24:59 +00:00 committed by Gerrit Code Review
commit 7e79b88700
3 changed files with 5 additions and 4 deletions

View File

@ -57,7 +57,7 @@ parameters:
NFS share to mount for image storage (when GlanceNfsEnabled is true)
type: string
GlanceNfsOptions:
default: 'intr,context=system_u:object_r:glance_var_lib_t:s0'
default: '_netdev,bg,intr,context=system_u:object_r:glance_var_lib_t:s0'
description: >
NFS mount options for image storage (when GlanceNfsEnabled is true)
type: string
@ -107,6 +107,7 @@ outputs:
- get_attr: [GlanceApiPuppetBase, role_data, config_settings]
- get_attr: [GlanceLogging, config_settings]
- glance::api::sync_db: false
- tripleo::glance::nfs_mount::edit_fstab: false
logging_source: {get_attr: [GlanceApiPuppetBase, role_data, logging_source]}
logging_groups: {get_attr: [GlanceApiPuppetBase, role_data, logging_groups]}
service_config_settings: {get_attr: [GlanceApiPuppetBase, role_data, service_config_settings]}
@ -221,7 +222,7 @@ outputs:
- - name: Mount NFS on host
vars:
nfs_backend_enable: {get_param: GlanceNfsEnabled}
mount: name=/var/lib/glance src="{{item.NFS_SHARE}}" fstype=nfs4 opts="{{item.NFS_OPTIONS}}" state=mounted
mount: name=/var/lib/glance/images src="{{item.NFS_SHARE}}" fstype=nfs4 opts="{{item.NFS_OPTIONS}}" state=mounted
with_items:
- NFS_SHARE: {get_param: GlanceNfsShare}
NFS_OPTIONS: {get_param: GlanceNfsOptions}

View File

@ -11,7 +11,7 @@
parameter_defaults:
# NFS mount options for image storage (when GlanceNfsEnabled is true)
# Type: string
GlanceNfsOptions: intr,context=system_u:object_r:glance_var_lib_t:s0
GlanceNfsOptions: _netdev,bg,intr,context=system_u:object_r:glance_var_lib_t:s0
# NFS share to mount for image storage (when GlanceNfsEnabled is true)
# Type: string

View File

@ -101,7 +101,7 @@ parameters:
NFS share to mount for image storage (when GlanceNfsEnabled is true)
type: string
GlanceNfsOptions:
default: 'intr,context=system_u:object_r:glance_var_lib_t:s0'
default: '_netdev,bg,intr,context=system_u:object_r:glance_var_lib_t:s0'
description: >
NFS mount options for image storage (when GlanceNfsEnabled is true)
type: string