openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove unneeded *_enable_backend hiera from Manila backends"

Browse Source
This commit is contained in:
Jenkins 2016-10-10 19:35:57 +00:00 committed by Gerrit Code Review
commit ca91ce746f
6 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
environments/manila-cephfsnative-config.yaml
View File

@ -9,7 +9,6 @@ resource_registry:
parameter_defaults: parameter_defaults:
ManilaCephFSNativeEnableBackend: true
ManilaCephFSNativeBackendName: cephfsnative ManilaCephFSNativeBackendName: cephfsnative
ManilaCephFSNativeDriverHandlesShareServers: false ManilaCephFSNativeDriverHandlesShareServers: false
ManilaCephFSNativeCephFSConfPath: '/etc/ceph/ceph.conf' ManilaCephFSNativeCephFSConfPath: '/etc/ceph/ceph.conf'

1
environments/manila-generic-config.yaml
View File

@ -11,7 +11,6 @@ parameter_defaults:
ManilaServiceInstancePassword: '' ManilaServiceInstancePassword: ''
ManilaServiceInstanceFlavorId: 2 ManilaServiceInstanceFlavorId: 2
ManilaServiceNetworkCidr: '172.16.0.0/16' ManilaServiceNetworkCidr: '172.16.0.0/16'
ManilaGenericEnableBackend: true
ManilaGenericBackendName: tripleo_generic ManilaGenericBackendName: tripleo_generic
ManilaGenericDriverHandlesShareServers: true ManilaGenericDriverHandlesShareServers: true
ManilaGenericSmbTemplateConfigPath: '$state_path/smb.conf' ManilaGenericSmbTemplateConfigPath: '$state_path/smb.conf'

1
environments/manila-netapp-config.yaml
View File

@ -7,7 +7,6 @@ resource_registry:
OS::Tripleo::Services::ManilaBackendNetapp: ../puppet/services/manila-backend-netapp.yaml OS::Tripleo::Services::ManilaBackendNetapp: ../puppet/services/manila-backend-netapp.yaml
parameter_defaults: parameter_defaults:
ManilaNetappEnableBackend: true
ManilaNetappBackendName: tripleo_netapp ManilaNetappBackendName: tripleo_netapp
ManilaNetappDriverHandlesShareServers: true ManilaNetappDriverHandlesShareServers: true
ManilaNetappLogin: '' ManilaNetappLogin: ''

4
puppet/services/manila-backend-cephfs.yaml
View File

@ -19,9 +19,6 @@ parameters:
via parameter_defaults in the resource registry. via parameter_defaults in the resource registry.
type: json type: json
# CephFS Native backend params: # CephFS Native backend params:
ManilaCephFSNativeEnableBackend:
type: boolean
default: false
ManilaCephFSNativeBackendName: ManilaCephFSNativeBackendName:
type: string type: string
default: cephfsnative default: cephfsnative
@ -50,7 +47,6 @@ outputs:
value: value:
service_name: manila_backend_cephfs service_name: manila_backend_cephfs
config_settings: config_settings:
manila::backend::cephfsnative::enable_backend: {get_param: ManilaCephFSNativeEnableBackend}
manila::backend::cephfsnative::title: {get_param: ManilaCephFSNativeBackendName} manila::backend::cephfsnative::title: {get_param: ManilaCephFSNativeBackendName}
manila::backend::cephfsnative::driver_handles_share_servers: {get_param: ManilaCephFSNativeDriverHandlesShareServers} manila::backend::cephfsnative::driver_handles_share_servers: {get_param: ManilaCephFSNativeDriverHandlesShareServers}
manila::backend::cephfsnative::share_backend_name: {get_param: ManilaCephFSNativeShareBackendName} manila::backend::cephfsnative::share_backend_name: {get_param: ManilaCephFSNativeShareBackendName}

4
puppet/services/manila-backend-generic.yaml
View File

@ -4,9 +4,6 @@ description: >
Openstack Manila generic backend. Openstack Manila generic backend.
parameters: parameters:
ManilaGenericEnableBackend:
type: boolean
default: false
ManilaGenericBackendName: ManilaGenericBackendName:
type: string type: string
default: tripleo_generic default: tripleo_generic
@ -73,7 +70,6 @@ outputs:
value: value:
service_name: manila_backend_generic service_name: manila_backend_generic
config_settings: config_settings:
manila_generic_enable_backend: {get_param: ManilaGenericEnableBackend}
manila::backend::generic::title: {get_param: ManilaGenericBackendName} manila::backend::generic::title: {get_param: ManilaGenericBackendName}
manila::backend::generic::driver_handles_share_servers: {get_param: ManilaGenericDriverHandlesShareServers} manila::backend::generic::driver_handles_share_servers: {get_param: ManilaGenericDriverHandlesShareServers}
manila::backend::generic::smb_template_config_path: {get_param: ManilaGenericSmbTemplateConfigPath} manila::backend::generic::smb_template_config_path: {get_param: ManilaGenericSmbTemplateConfigPath}

4
puppet/services/manila-backend-netapp.yaml
View File

@ -4,9 +4,6 @@ description: >
Openstack Manila netapp backend. Openstack Manila netapp backend.
parameters: parameters:
ManilaNetappEnableBackend:
type: boolean
default: false
ManilaNetappDriverHandlesShareServers: ManilaNetappDriverHandlesShareServers:
type: string type: string
default: true default: true
@ -88,7 +85,6 @@ outputs:
value: value:
service_name: manila_backend_netapp service_name: manila_backend_netapp
config_settings: config_settings:
manila_netapp_enable_backend: {get_param: ManilaNetappEnableBackend}
manila::backend::netapp::title: {get_param: ManilaNetappBackendName} manila::backend::netapp::title: {get_param: ManilaNetappBackendName}
manila::backend::netapp::netapp_login: {get_param: ManilaNetappLogin} manila::backend::netapp::netapp_login: {get_param: ManilaNetappLogin}
manila::backend::netapp::driver_handles_share_servers: {get_param: ManilaNetappDriverHandlesShareServers} manila::backend::netapp::driver_handles_share_servers: {get_param: ManilaNetappDriverHandlesShareServers}