Change flat network name for nosdn fdio scenario

[apex-tripleo-heat-templates.git] / puppet / services / manila-backend-generic.yaml

diff --git a/puppet/services/manila-backend-generic.yaml b/puppet/services/manila-backend-generic.yaml
index 5c001c8..44f4a64 100644 (file)
--- a/puppet/services/manila-backend-generic.yaml
+++ b/puppet/services/manila-backend-generic.yaml
@@ -1,12 +1,9 @@
-heat_template_version: 2016-04-08
+heat_template_version: pike
 
 description: >
   Openstack Manila generic backend.
 
 parameters:
-  ManilaGenericEnableBackend:
-    type: boolean
-    default: false
   ManilaGenericBackendName:
     type: string
     default: tripleo_generic
@@ -52,6 +49,10 @@ parameters:
   ManilaServiceNetworkCidr:
     type: string
     default: '172.16.0.0/16'
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -61,6 +62,14 @@ parameters:
   DefaultPasswords:
     default: {}
     type: json
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
   EndpointMap:
     default: {}
     type: json
@@ -73,7 +82,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}