Merge "Remove unneeded *_enable_backend hiera from Manila backends"

3 files changed, 0 insertions, 12 deletions

diff --git a/puppet/services/manila-backend-cephfs.yaml b/puppet/services/manila-backend-cephfs.yaml
index 37b0a1d2..0fc39e2a 100644
--- a/puppet/services/manila-backend-cephfs.yaml
+++ b/puppet/services/manila-backend-cephfs.yaml
@@ -19,9 +19,6 @@ parameters:
                  via parameter_defaults in the resource registry.
     type: json
   # CephFS Native backend params:
-  ManilaCephFSNativeEnableBackend:
-    type: boolean
-    default: false
   ManilaCephFSNativeBackendName:
     type: string
     default: cephfsnative
@@ -50,7 +47,6 @@ outputs:
     value:
       service_name: manila_backend_cephfs
       config_settings:
-        manila::backend::cephfsnative::enable_backend: {get_param: ManilaCephFSNativeEnableBackend}
         manila::backend::cephfsnative::title: {get_param: ManilaCephFSNativeBackendName}
         manila::backend::cephfsnative::driver_handles_share_servers: {get_param: ManilaCephFSNativeDriverHandlesShareServers}
         manila::backend::cephfsnative::share_backend_name: {get_param: ManilaCephFSNativeShareBackendName}
diff --git a/puppet/services/manila-backend-generic.yaml b/puppet/services/manila-backend-generic.yaml
index 5c001c82..c527666e 100644
--- a/puppet/services/manila-backend-generic.yaml
+++ b/puppet/services/manila-backend-generic.yaml
@@ -4,9 +4,6 @@ description: >
   Openstack Manila generic backend.
 
 parameters:
-  ManilaGenericEnableBackend:
-    type: boolean
-    default: false
   ManilaGenericBackendName:
     type: string
     default: tripleo_generic
@@ -73,7 +70,6 @@ outputs:
     value:
       service_name: manila_backend_generic
       config_settings:
-        manila_generic_enable_backend: {get_param: ManilaGenericEnableBackend}
         manila::backend::generic::title: {get_param: ManilaGenericBackendName}
         manila::backend::generic::driver_handles_share_servers: {get_param: ManilaGenericDriverHandlesShareServers}
         manila::backend::generic::smb_template_config_path: {get_param: ManilaGenericSmbTemplateConfigPath}
diff --git a/puppet/services/manila-backend-netapp.yaml b/puppet/services/manila-backend-netapp.yaml
index c95a8da7..e6d2f250 100644
--- a/puppet/services/manila-backend-netapp.yaml
+++ b/puppet/services/manila-backend-netapp.yaml
@@ -4,9 +4,6 @@ description: >
   Openstack Manila netapp backend.
 
 parameters:
-  ManilaNetappEnableBackend:
-    type: boolean
-    default: false
   ManilaNetappDriverHandlesShareServers:
     type: string
     default: true
@@ -88,7 +85,6 @@ outputs:
     value:
       service_name: manila_backend_netapp
       config_settings:
-        manila_netapp_enable_backend: {get_param: ManilaNetappEnableBackend}
         manila::backend::netapp::title: {get_param: ManilaNetappBackendName}
         manila::backend::netapp::netapp_login: {get_param: ManilaNetappLogin}
         manila::backend::netapp::driver_handles_share_servers: {get_param: ManilaNetappDriverHandlesShareServers}