Use native YAML syntax in mount tasks
Generally it is recommended[1] to use native YAML syntax in ansible instead of one line definition, because it brings some benefits like clear difference detected in git. This patch updates existing mount tasks to follow that recommendation. [1] https://www.ansible.com/blog/ansible-best-practices-essentials Change-Id: I42c55ee0f69234fd54003e9cc471570f668c17b6
This commit is contained in:
parent
d58efb58e0
commit
3364256368
@ -680,7 +680,12 @@ outputs:
|
|||||||
netapp_share_location: {get_param: NetappShareLocation}
|
netapp_share_location: {get_param: NetappShareLocation}
|
||||||
nfs_share: "{{ glance_nfs_share if (glance_nfs_share) else netapp_share_location }}"
|
nfs_share: "{{ glance_nfs_share if (glance_nfs_share) else netapp_share_location }}"
|
||||||
nfs_options: {get_param: GlanceNfsOptions}
|
nfs_options: {get_param: GlanceNfsOptions}
|
||||||
mount: name=/var/lib/glance/images src="{{nfs_share}}" fstype=nfs opts="{{nfs_options}}" state=mounted
|
mount:
|
||||||
|
name: /var/lib/glance/images
|
||||||
|
state: mounted
|
||||||
|
fstype: nfs
|
||||||
|
src: "{{nfs_share}}"
|
||||||
|
opts: "{{nfs_options}}"
|
||||||
when: nfs_backend_enabled or glance_netapp_nfs_enabled
|
when: nfs_backend_enabled or glance_netapp_nfs_enabled
|
||||||
- name: Mount Node Staging Location
|
- name: Mount Node Staging Location
|
||||||
vars:
|
vars:
|
||||||
@ -688,7 +693,12 @@ outputs:
|
|||||||
glance_staging_nfs_share: {get_param: GlanceStagingNfsShare}
|
glance_staging_nfs_share: {get_param: GlanceStagingNfsShare}
|
||||||
glance_nfs_options: {get_param: GlanceStagingNfsOptions}
|
glance_nfs_options: {get_param: GlanceStagingNfsOptions}
|
||||||
# Gleaning mount point by stripping "file://" prefix from staging uri
|
# Gleaning mount point by stripping "file://" prefix from staging uri
|
||||||
mount: name="{{glance_node_staging_uri[7:]}}" src="{{glance_staging_nfs_share}}" fstype=nfs opts="{{glance_nfs_options}}" state=mounted
|
mount:
|
||||||
|
name: "{{glance_node_staging_uri[7:]}}"
|
||||||
|
state: mounted
|
||||||
|
fstype: nfs
|
||||||
|
src: "{{glance_staging_nfs_share}}"
|
||||||
|
opts: "{{glance_nfs_options}}"
|
||||||
when: glance_staging_nfs_share != ''
|
when: glance_staging_nfs_share != ''
|
||||||
- name: ensure ceph configurations exist
|
- name: ensure ceph configurations exist
|
||||||
file:
|
file:
|
||||||
|
@ -906,7 +906,12 @@ outputs:
|
|||||||
nfs_share: {get_attr: [RoleParametersValue, value, nfs_share]}
|
nfs_share: {get_attr: [RoleParametersValue, value, nfs_share]}
|
||||||
nfs_options: {get_attr: [RoleParametersValue, value, nfs_options]}
|
nfs_options: {get_attr: [RoleParametersValue, value, nfs_options]}
|
||||||
nfs_vers: {get_attr: [RoleParametersValue, value, nfs_vers]}
|
nfs_vers: {get_attr: [RoleParametersValue, value, nfs_vers]}
|
||||||
mount: name=/var/lib/nova/instances src="{{nfs_share}}" fstype=nfs4 opts="_netdev,bg,{{nfs_options}},vers={{nfs_vers}},nfsvers={{nfs_vers}}" state=mounted
|
mount:
|
||||||
|
name: /var/lib/nova/instances
|
||||||
|
state: mounted
|
||||||
|
fstype: nfs4
|
||||||
|
src: "{{nfs_share}}"
|
||||||
|
opts: "_netdev,bg,{{nfs_options}},vers={{nfs_vers}},nfsvers={{nfs_vers}}"
|
||||||
when: nfs_backend_enable|bool
|
when: nfs_backend_enable|bool
|
||||||
- name: is Nova Resume Guests State On Host Boot enabled
|
- name: is Nova Resume Guests State On Host Boot enabled
|
||||||
set_fact:
|
set_fact:
|
||||||
|
Loading…
Reference in New Issue
Block a user