Merge "Open ports 443 and 80 on haproxy's firewall when horizon is standalone"

[apex-tripleo-heat-templates.git] / puppet / services / cinder-backend-netapp.yaml

diff --git a/puppet/services/cinder-backend-netapp.yaml b/puppet/services/cinder-backend-netapp.yaml
index 29a0ce1..bddc8e1 100644 (file)
--- a/puppet/services/cinder-backend-netapp.yaml
+++ b/puppet/services/cinder-backend-netapp.yaml
@@ -1,8 +1,30 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: Openstack Cinder Netapp backend
 
 parameters:
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  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: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
   CinderEnableNetappBackend:
     type: boolean
     default: true
@@ -75,20 +97,6 @@ parameters:
   CinderNetappEseriesHostType:
     type: string
     default: 'linux_dm_mp'
-  ServiceNetMap:
-    default: {}
-    description: Mapping of service_name -> network name. Typically set
-                 via parameter_defaults in the resource registry.  This
-                 mapping overrides those in ServiceNetMapDefaults.
-    type: json
-  DefaultPasswords:
-    default: {}
-    type: json
-  EndpointMap:
-    default: {}
-    type: json
-    description: Mapping of service endpoint -> protocol. Typically set
-                 via parameter_defaults in the resource registry.
 
 parameter_groups:
 - label: deprecated