Change flat network name for nosdn fdio scenario

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

diff --git a/puppet/services/cinder-backend-dellps.yaml b/puppet/services/cinder-backend-dellps.yaml
index 1f15c53..388e49b 100644 (file)
--- a/puppet/services/cinder-backend-dellps.yaml
+++ b/puppet/services/cinder-backend-dellps.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   Openstack Cinder Dell EMC PS Series backend
@@ -31,6 +31,9 @@ parameters:
   CinderDellPsSanPassword:
     type: string
     hidden: true
+  CinderDellPsSanPrivateKey:
+    type: string
+    default: ''
   CinderDellPsSanThinProvision:
     type: boolean
     default: true
@@ -49,6 +52,10 @@ parameters:
   CinderDellPsUseChap:
     type: boolean
     default: false
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -58,6 +65,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
@@ -75,6 +90,7 @@ outputs:
         cinder::backend::eqlx::san_ip: {get_param: CinderDellPsSanIp}
         cinder::backend::eqlx::san_login: {get_param: CinderDellPsSanLogin}
         cinder::backend::eqlx::san_password: {get_param: CinderDellPsSanPassword}
+        cinder::backend::eqlx::san_private_key: {get_param: CinderDellPsSanPrivateKey}
         cinder::backend::eqlx::san_thin_provision: {get_param: CinderDellPsSanThinProvision}
         cinder::backend::eqlx::eqlx_group_name: {get_param: CinderDellPsGroupname}
         cinder::backend::eqlx::eqlx_pool: {get_param: CinderDellPsPool}