Quote empty strings in manila netapp driver
Empty strings are converted into null values in hieradata YAML files and deployment then fails because of missing hiera data. Quoting these empty strings assures that deployment passes even if a user doesn't override default values. This issue is specific to Newton release only, in Ocata JSON format is used for hieradata files (Ibe7e2044e200e2c947223286fdf4fd5bcf98c2e1). Change-Id: I71e74161b302a19e7df2c7ccccf9bc536a68d9c8 Closes-Bug: #1660930
This commit is contained in:
parent
17bd1d4f12
commit
148eb61032
|
@ -10,21 +10,21 @@ parameter_defaults:
|
|||
ManilaNetappEnableBackend: true
|
||||
ManilaNetappBackendName: tripleo_netapp
|
||||
ManilaNetappDriverHandlesShareServers: true
|
||||
ManilaNetappLogin: ''
|
||||
ManilaNetappPassword: ''
|
||||
ManilaNetappServerHostname: ''
|
||||
ManilaNetappLogin: "''"
|
||||
ManilaNetappPassword: "''"
|
||||
ManilaNetappServerHostname: "''"
|
||||
ManilaNetappTransportType: 'http'
|
||||
ManilaNetappStorageFamily: 'ontap_cluster'
|
||||
ManilaNetappServerPort: 80
|
||||
ManilaNetappVolumeNameTemplate: 'share_%(share_id)s'
|
||||
ManilaNetappVserver: ''
|
||||
ManilaNetappVserver: "''"
|
||||
ManilaNetappVserverNameTemplate: 'os_%s'
|
||||
ManilaNetappLifNameTemplate: 'os_%(net_allocation_id)s'
|
||||
ManilaNetappAggrNameSearchPattern: '(.*)'
|
||||
ManilaNetappRootVolumeAggr: ''
|
||||
ManilaNetappRootVolumeAggr: "''"
|
||||
ManilaNetappRootVolume: 'root'
|
||||
ManilaNetappPortNameSearchPattern: '(.*)'
|
||||
ManilaNetappTraceFlags: ''
|
||||
ManilaNetappTraceFlags: "''"
|
||||
ManilaNetappEnabledShareProtocols: 'nfs3, nfs4.0'
|
||||
ManilaNetappVolumeSnapshotReservePercent: 5
|
||||
ManilaNetappSnapmirrorQuiesceTimeout: 3600
|
||||
|
|
|
@ -15,13 +15,13 @@ parameters:
|
|||
default: tripleo_netapp
|
||||
ManilaNetappLogin:
|
||||
type: string
|
||||
default: ''
|
||||
default: "''"
|
||||
ManilaNetappPassword:
|
||||
type: string
|
||||
default: ''
|
||||
default: "''"
|
||||
ManilaNetappServerHostname:
|
||||
type: string
|
||||
default: ''
|
||||
default: "''"
|
||||
ManilaNetappTransportType:
|
||||
type: string
|
||||
default: 'http'
|
||||
|
@ -36,7 +36,7 @@ parameters:
|
|||
default: 'share_%(share_id)s'
|
||||
ManilaNetappVserver:
|
||||
type: string
|
||||
default: ''
|
||||
default: "''"
|
||||
ManilaNetappVserverNameTemplate:
|
||||
type: string
|
||||
default: 'os_%s'
|
||||
|
@ -48,7 +48,7 @@ parameters:
|
|||
default: '(.*)'
|
||||
ManilaNetappRootVolumeAggr:
|
||||
type: string
|
||||
default: ''
|
||||
default: "''"
|
||||
ManilaNetappRootVolume:
|
||||
type: string
|
||||
default: 'root'
|
||||
|
@ -57,7 +57,7 @@ parameters:
|
|||
default: '(.*)'
|
||||
ManilaNetappTraceFlags:
|
||||
type: string
|
||||
default: ''
|
||||
default: "''"
|
||||
ManilaNetappEnabledShareProtocols:
|
||||
type: string
|
||||
default: 'nfs3, nfs4.0'
|
||||
|
|
Loading…
Reference in New Issue