From 87e83b796d2f2900b536a6b0a2b67d9cc810845f Mon Sep 17 00:00:00 2001
From: Giulio Fidente <gfidente@redhat.com>
Date: Fri, 7 Oct 2016 12:33:50 +0200
Subject: Remove unneeded *_enable_backend hiera from Manila backends

Depends-On: I04e28a95e8d69a24cd3df109bf1802bfcbd941db

Change-Id: I4ada033155e5fde0add08ec9aa8f6af7c31d53f3
---
 environments/manila-cephfsnative-config.yaml | 1 -
 environments/manila-generic-config.yaml      | 1 -
 environments/manila-netapp-config.yaml       | 1 -
 puppet/services/manila-backend-cephfs.yaml   | 4 ----
 puppet/services/manila-backend-generic.yaml  | 4 ----
 puppet/services/manila-backend-netapp.yaml   | 4 ----
 6 files changed, 15 deletions(-)

diff --git a/environments/manila-cephfsnative-config.yaml b/environments/manila-cephfsnative-config.yaml
index c2f65800..825a5066 100644
--- a/environments/manila-cephfsnative-config.yaml
+++ b/environments/manila-cephfsnative-config.yaml
@@ -9,7 +9,6 @@ resource_registry:
 
 
 parameter_defaults:
-  ManilaCephFSNativeEnableBackend: true
   ManilaCephFSNativeBackendName: cephfsnative
   ManilaCephFSNativeDriverHandlesShareServers: false
   ManilaCephFSNativeCephFSConfPath: '/etc/ceph/ceph.conf'
diff --git a/environments/manila-generic-config.yaml b/environments/manila-generic-config.yaml
index a847a02b..9344bc6e 100644
--- a/environments/manila-generic-config.yaml
+++ b/environments/manila-generic-config.yaml
@@ -11,7 +11,6 @@ parameter_defaults:
   ManilaServiceInstancePassword: ''
   ManilaServiceInstanceFlavorId: 2
   ManilaServiceNetworkCidr: '172.16.0.0/16'
-  ManilaGenericEnableBackend: true
   ManilaGenericBackendName: tripleo_generic
   ManilaGenericDriverHandlesShareServers: true
   ManilaGenericSmbTemplateConfigPath: '$state_path/smb.conf'
diff --git a/environments/manila-netapp-config.yaml b/environments/manila-netapp-config.yaml
index 98de6adf..3dadfe5d 100644
--- a/environments/manila-netapp-config.yaml
+++ b/environments/manila-netapp-config.yaml
@@ -7,7 +7,6 @@ resource_registry:
   OS::Tripleo::Services::ManilaBackendNetapp: ../puppet/services/manila-backend-netapp.yaml
 
 parameter_defaults:
-  ManilaNetappEnableBackend: true
   ManilaNetappBackendName: tripleo_netapp
   ManilaNetappDriverHandlesShareServers: true
   ManilaNetappLogin: ''
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}
-- 
cgit 1.2.3-korg